ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Vladyslav Shchepotin 2019-01-08 09:24:32 +02:00 committed by Shao Yu-Lung (Allen)
parent d8c36ab860
commit d03ead34a2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

1
nginx/Dockerfile
View File

@ -26,6 +26,7 @@ RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREA
&& rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/conf.d/default.conf
ADD ./startup.sh /opt/startup.sh ADD ./startup.sh /opt/startup.sh
RUN sed -i 's/\r//g' /opt/startup.sh
CMD ["/bin/bash", "/opt/startup.sh"] CMD ["/bin/bash", "/opt/startup.sh"]
EXPOSE 80 443 EXPOSE 80 443