Hotfix for public 1.2.2

[proxy.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index a2780590b06f747f0629f939d5cd8f85bd58662f..fec3730b8e32650111d6cb2961bfa08e5b5c6885 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,12 @@
 # requires variable config loading, such as:
-# docker stack deploy -c <(docker-compose config) proxy
+# docker stack deploy -c <(docker-compose config) purplebirdman
 #
-# also needs an .env file with some variables like:
-# LOCAL_STORAGE=/mnt/data2/purplebirdman/art
-# IPV4_WAN=public.purplebirdman.com
+# also needs an .env file with some variables!
 
 version: '3'
 services:
     proxy:
         image: nginx:1.17
-        deploy:
-            restart_policy:
-                condition: on-failure
-                delay: 5s
-                max_attempts: 5
-                window: 10s
         volumes:
         - ./proxy/nginx.conf:/etc/nginx/nginx.conf
         - /etc/ssl/certs/purplebirdman/:/etc/ssl/certs/
@@ -23,27 +15,28 @@ services:
         - NGINX_PORT=443
         ports:
         - 443:443
+        depends_on:
+        - purplebirdman
+        - kanboard
+        - public
+    purplebirdman:
+        image: cjpalmer/purplebirdman:1.0.0
     kanboard:
         image: kanboard/kanboard:v1.2.26
-        deploy:
-            restart_policy:
-                condition: on-failure
-                delay: 5s
-                max_attempts: 5
-                window: 10s
         volumes:
         - kanboard_data:/var/www/app/data
         - kanboard_plugins:/var/www/app/plugins
         - kanboard_ssl:/etc/nginx/ssl
     public:
-        image: cliftonpalmer/public:1.0.0
+        image: cjpalmer/public:1.2.2
         volumes:
-        - ${LOCAL_STORAGE}:/storage
+        - ${SHARE_ROOT}:/storage
         - public_data:/usr/local/apache2/htdocs
+        - httpd_users:/usr/local/apache2/auth
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs
-        - PUBLIC_HTTP_URI=https://${IPV4_WAN}
+        - PUBLIC_FQDN_OVERRIDE=https://public.purplebirdman.com
 volumes:
     kanboard_data:
         driver: local
@@ -61,3 +54,5 @@ volumes:
             o: bind
             type: none
             device: /mnt/public_data
+    httpd_users:
+        driver: local