From 9fffc943d706a0d9c5a3ce6136d3401ec7c84e51 Mon Sep 17 00:00:00 2001
From: pnoker <pnokers@icloud.com>
Date: Tue, 20 Oct 2020 15:49:55 +0800
Subject: [PATCH] =?UTF-8?q?demo=20=E5=90=AF=E5=8A=A8=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                                       |  2 --
 Dockerfile                                          | 13 +++++++++----
 dc3/{ => dependencies}/conf.crt/dc3.site/README     |  0
 dc3/{ => dependencies}/conf.crt/dc3.site/cert.pem   |  0
 dc3/{ => dependencies}/conf.crt/dc3.site/chain.pem  |  0
 .../conf.crt/dc3.site/fullchain.pem                 |  0
 .../conf.crt/dc3.site/privkey.pem                   |  0
 dc3/{ => dependencies}/ssl/certs/dhparam.pem        |  0
 dc3/docker-compose.yml                              |  8 ++++++--
 9 files changed, 15 insertions(+), 8 deletions(-)
 rename dc3/{ => dependencies}/conf.crt/dc3.site/README (100%)
 rename dc3/{ => dependencies}/conf.crt/dc3.site/cert.pem (100%)
 rename dc3/{ => dependencies}/conf.crt/dc3.site/chain.pem (100%)
 rename dc3/{ => dependencies}/conf.crt/dc3.site/fullchain.pem (100%)
 rename dc3/{ => dependencies}/conf.crt/dc3.site/privkey.pem (100%)
 rename dc3/{ => dependencies}/ssl/certs/dhparam.pem (100%)

diff --git a/.dockerignore b/.dockerignore
index a980794..3c3629e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1 @@
 node_modules
-public
-src
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index d1b7b39..b072189 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,17 @@
 #   limitations under the License.
 #
 
-FROM nginx:1.18.0
-MAINTAINER pnoker pnokers.icloud.com
+FROM pnoker/alpine-nginx:1.18.0
+MAINTAINER pnoker pnokers@icloud.com
 
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-COPY ./dc3/ssl/ /etc/ssl/
 COPY ./dc3/nginx/ /etc/nginx/
-COPY ./dc3/conf.crt/ /etc/nginx/conf.crt/
 COPY ./dist/ /usr/share/nginx/html/
+COPY ./dc3/dependencies/ssl/ /etc/ssl/
+COPY ./dc3/dependencies/conf.crt/ /etc/nginx/conf.crt/
+
+EXPOSE 443
+VOLUME /var/log/nginx
+
+CMD /bin/wait-for dc3-auth:8300 dc3-manager:8400 dc3-data:8500 -t 5 -- nginx -g 'daemon off;'
diff --git a/dc3/conf.crt/dc3.site/README b/dc3/dependencies/conf.crt/dc3.site/README
similarity index 100%
rename from dc3/conf.crt/dc3.site/README
rename to dc3/dependencies/conf.crt/dc3.site/README
diff --git a/dc3/conf.crt/dc3.site/cert.pem b/dc3/dependencies/conf.crt/dc3.site/cert.pem
similarity index 100%
rename from dc3/conf.crt/dc3.site/cert.pem
rename to dc3/dependencies/conf.crt/dc3.site/cert.pem
diff --git a/dc3/conf.crt/dc3.site/chain.pem b/dc3/dependencies/conf.crt/dc3.site/chain.pem
similarity index 100%
rename from dc3/conf.crt/dc3.site/chain.pem
rename to dc3/dependencies/conf.crt/dc3.site/chain.pem
diff --git a/dc3/conf.crt/dc3.site/fullchain.pem b/dc3/dependencies/conf.crt/dc3.site/fullchain.pem
similarity index 100%
rename from dc3/conf.crt/dc3.site/fullchain.pem
rename to dc3/dependencies/conf.crt/dc3.site/fullchain.pem
diff --git a/dc3/conf.crt/dc3.site/privkey.pem b/dc3/dependencies/conf.crt/dc3.site/privkey.pem
similarity index 100%
rename from dc3/conf.crt/dc3.site/privkey.pem
rename to dc3/dependencies/conf.crt/dc3.site/privkey.pem
diff --git a/dc3/ssl/certs/dhparam.pem b/dc3/dependencies/ssl/certs/dhparam.pem
similarity index 100%
rename from dc3/ssl/certs/dhparam.pem
rename to dc3/dependencies/ssl/certs/dhparam.pem
diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml
index acbfd31..f522e8e 100644
--- a/dc3/docker-compose.yml
+++ b/dc3/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3'
 
 services:
   web:
@@ -8,15 +8,19 @@ services:
     image: registry.cn-beijing.aliyuncs.com/dc3/dc3-web:1.0
     restart: always
     ports:
-      - 80:80
       - 443:443
     container_name: dc3-web
     hostname: dc3-web
+    volumes:
+      - nginx:/var/log/nginx
     networks:
       dc3net:
         aliases:
           - dc3-web
 
+volumes:
+  nginx:
+
 networks:
   dc3net:
     driver: 'bridge'