phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl
unstructuredstudio · Jan 7, 2021 · 8c252de · 8c252de
1 parent 53626bb
commit 8c252de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/zubhub_frontend/zubhub/deploy_frontend.sh b/zubhub_frontend/zubhub/deploy_frontend.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 mv zubhub_frontend/zubhub/.env zubhub/zubhub_frontend/zubhub/.env
-mv zubhub_frontend/zubhub/.zero-ssl zubhub/zubhub_frontend/zubhub/
+mv zubhub_frontend/zubhub/.ssl-data zubhub/zubhub_frontend/zubhub/
 rm -rf zubhub_frontend
 cp -r zubhub/zubhub_frontend/ zubhub_frontend/
 rm -rf zubhub/ zubhub_frontend/zubhub/.env.example

diff --git a/zubhub_frontend/zubhub/docker-compose.yml b/zubhub_frontend/zubhub/docker-compose.yml
@@ -13,14 +13,20 @@ services:
       - "8080:80"
 
   reverse-proxy:
-    image: nginx:stable-alpine
+    image: valian/docker-nginx-auto-ssl:1.0.0
     container_name: reverse-proxy
     restart: on-failure
     ports:
       - 80:80
       - 443:443
     volumes:
-      - ./.zero-ssl:/etc/ssl
-      - ./reverse-proxy:/etc/nginx
+      - ./.ssl-data:/etc/resty-auto-ssl
+    environment:
+      ALLOWED_DOMAINS: "(zubhub|www.zubhub).unstructured.studio"
+      SITES: "zubhub.unstructured.studio=zubhub_frontend;www.zubhub.unstructured.studio=zubhub_frontend"
+      FORCE_HTTPS: "true"
     depends_on:
       - zubhub_frontend
+
+volumes:
+  .ssl-data: