Hotfix for public 1.2.2

[proxy.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 55e7ef1ab21ca4d377da89870d952c445b6aaef6..fec3730b8e32650111d6cb2961bfa08e5b5c6885 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,7 @@
 # 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:
@@ -18,8 +16,11 @@ services:
         ports:
         - 443:443
         depends_on:
+        - purplebirdman
         - kanboard
         - public
+    purplebirdman:
+        image: cjpalmer/purplebirdman:1.0.0
     kanboard:
         image: kanboard/kanboard:v1.2.26
         volumes:
@@ -27,14 +28,15 @@ services:
         - 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
@@ -52,3 +54,5 @@ volumes:
             o: bind
             type: none
             device: /mnt/public_data
+    httpd_users:
+        driver: local