From d03ead34a2714dd582a08da96e2a641ed80a2464 Mon Sep 17 00:00:00 2001
From: Vladyslav Shchepotin <vladislav.schepotin@gmail.com>
Date: Tue, 8 Jan 2019 09:24:32 +0200
Subject: [PATCH] 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
---
 .gitignore       | 3 +++
 nginx/Dockerfile | 1 +
 2 files changed, 4 insertions(+)

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