Updated public to 1.2.0

diff --git a/docker-compose.yml b/docker-compose.yml
index 2a6945bf128299477153adc812d9e084a8f617af..5c0e8e92af23f00d7a2972dd176fc200c1001529 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,7 @@
 # requires variable config loading, such as:
 # 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:
 
 version: '3'
 services:


@@ -30,14 +28,14 @@ services:
         - kanboard_plugins:/var/www/app/plugins
         - kanboard_ssl:/etc/nginx/ssl
     public:
         - kanboard_plugins:/var/www/app/plugins
         - kanboard_ssl:/etc/nginx/ssl
     public:

-        image: cjpalmer/public:1.1.0
+        image: cjpalmer/public:1.2.0

         volumes:
         volumes:

-        - ${LOCAL_STORAGE}:/storage
+        - ${SHARE_ROOT}:/storage

         - public_data:/usr/local/apache2/htdocs
         - public_data:/usr/local/apache2/htdocs

+        - httpd_users:/usr/local/apache2/auth

         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs

-        - PUBLIC_HTTP_URI=https://${IPV4_WAN}

 volumes:
     kanboard_data:
         driver: local
 volumes:
     kanboard_data:
         driver: local


@@ -55,3 +53,5 @@ volumes:
             o: bind
             type: none
             device: /mnt/public_data
             o: bind
             type: none
             device: /mnt/public_data

+    httpd_users:
+        driver: local