From 206675a6e2402faa902f16c97868ecff7d8715dd Mon Sep 17 00:00:00 2001
From: Mathieu Sanchez <mathieu.sanchez@outlook.fr>
Date: Wed, 3 Apr 2019 17:17:08 +0900
Subject: [PATCH] Change nginx install

---
 docker/gitlab.sh        | 20 ++++++++++----------
 docker/install-nginx.sh | 20 +++++---------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/docker/gitlab.sh b/docker/gitlab.sh
index bd96b8f..dfe6661 100755
--- a/docker/gitlab.sh
+++ b/docker/gitlab.sh
@@ -1,12 +1,12 @@
 docker run --detach \
     --name gitlab \
-  	--publish 8001:80 \
-  	--publish 44301:443 \
-  	--publish 2201:22 \
-  	--hostname gitlab.c2a-system.dev \
-  	--env GITLAB_OMNIBUS_CONFIG="external_url 'http://gitlab.c2a-system.dev/';  gitlab_rails['gitlab_shell_ssh_port'] = 2201;" \
-  	--volume /srv/gitlab/config:/etc/gitlab \
-  	--volume /srv/gitlab/logs:/var/log/gitlab \
-  	--volume /srv/gitlab/data:/var/opt/gitlab \
-  	--restart unless-stopped \
-  	gitlab/gitlab-ce:latest
+    --publish 8001:80 \
+    --publish 44301:443 \
+    --publish 2201:22 \
+    --hostname gitlab.c2a-system.dev \
+    --env GITLAB_OMNIBUS_CONFIG="external_url 'http://gitlab.c2a-system.dev/';  gitlab_rails['gitlab_shell_ssh_port'] = 2201;" \
+    --volume /srv/gitlab/config:/etc/gitlab \
+    --volume /srv/gitlab/logs:/var/log/gitlab \
+    --volume /srv/gitlab/data:/var/opt/gitlab \
+    --restart unless-stopped \
+    gitlab/gitlab-ce:latest
diff --git a/docker/install-nginx.sh b/docker/install-nginx.sh
index 661c217..9ae037b 100755
--- a/docker/install-nginx.sh
+++ b/docker/install-nginx.sh
@@ -1,15 +1,5 @@
-mkdir /home/c2a/conf
-mkdir /home/c2a/conf/nginx
-mkdir /home/c2a/conf/nginx/applications
-cp ./docker/conf/nginx.conf /home/c2a/conf/nginx/
-cp ./docker/conf/mime.types /home/c2a/conf/nginx/
-cp ./docker/conf/applications/* /home/c2a/conf/nginx/applications/
-docker run --detach \
-  	--name nginx \
-  	--publish 80:80 \
-  	--publish 443:443 \
-  	--volume /home/c2a/conf/nginx/nginx.conf:/etc/nginx/nginx.conf \
-  	--volume /home/c2a/conf/nginx/mime.types:/etc/nginx/mime.types \
-  	--volume /home/c2a/conf/nginx/applications:/etc/nginx/conf.d \
-  	--restart unless-stopped \
-  	nginx:latest
+cp ./docker/conf/nginx.conf /etc/nginx/
+cp ./docker/conf/mime.types /etc/nginx/
+cp ./docker/conf/applications/* /etc/nginx/conf.d/
+
+apt-get install nginx
\ No newline at end of file