diff --git a/.gitignore b/.gitignore index 890c25c1..9888e50d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /.project .docker-sync /jenkins/jenkins_home +/nginx/ssl/*.crt +/nginx/ssl/*.key +/nginx/ssl/*.csr diff --git a/nginx/Dockerfile b/nginx/Dockerfile index c6481303..12c456d8 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -26,6 +26,7 @@ RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREA && rm /etc/nginx/conf.d/default.conf ADD ./startup.sh /opt/startup.sh +RUN sed -i 's/\r//g' /opt/startup.sh CMD ["/bin/bash", "/opt/startup.sh"] EXPOSE 80 443