Skip to content

Commit d03ead3

Browse files
Shchepotinbestlong
authored andcommitted
Nginx for Windows (laradock#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
1 parent d8c36ab commit d03ead3

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
/.project
66
.docker-sync
77
/jenkins/jenkins_home
8+
/nginx/ssl/*.crt
9+
/nginx/ssl/*.key
10+
/nginx/ssl/*.csr

nginx/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREA
2626
&& rm /etc/nginx/conf.d/default.conf
2727

2828
ADD ./startup.sh /opt/startup.sh
29+
RUN sed -i 's/\r//g' /opt/startup.sh
2930
CMD ["/bin/bash", "/opt/startup.sh"]
3031

3132
EXPOSE 80 443

0 commit comments

Comments
 (0)