Pārlūkot izejas kodu

Nginx for Windows (#1879)

* feature(nginx): add OpenSSL
* feature(nginx): add volume to store the certificates
* feature(nginx): add option installation OpenSSL
* feature(nginx): autogenerate certificates
* chore(nginx): add new line at end of file
* fix(nginx): fix run nginx on Windows
* fix(gitignore): end of file
Vladyslav Shchepotin 6 gadi atpakaļ
vecāks
revīzija
d03ead34a2
2 mainītis faili ar 4 papildinājumiem un 0 dzēšanām
  1. 3 0
      .gitignore
  2. 1 0
      nginx/Dockerfile

+ 3 - 0
.gitignore

@@ -5,3 +5,6 @@
 /.project
 .docker-sync
 /jenkins/jenkins_home
+/nginx/ssl/*.crt
+/nginx/ssl/*.key
+/nginx/ssl/*.csr

+ 1 - 0
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