Updated local compose variables

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 79bcf0283dd124e2d00c847f77dbf1c48d04b599..6ecf00114aa9f2c92c0c5640ef10eca64017d5f7 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -1,5 +1,5 @@
 # requires variable config loading, such as:
 # requires variable config loading, such as:

-# docker stack deploy -c <(docker-compose config) public
+# docker stack deploy -c <(docker-compose -f *prod* config) public

 #
 # also needs an .env file with some variables!
 
 #
 # also needs an .env file with some variables!
 


@@ -8,11 +8,11 @@ networks:
     proxy:
         external: true
 services:
     proxy:
         external: true
 services:

-    public:
+    web:

         image: cjpalmer/public:1.2.3
         volumes:
         image: cjpalmer/public:1.2.3
         volumes:

-        - ${SHARE_ROOT}:/storage
-        - public_data:/usr/local/apache2/htdocs
+        - ${LOCAL_ROOT_DIR}:/storage
+        - ${LOCAL_LINK_DIR}:/usr/local/apache2/htdocs

         - httpd_users:/usr/local/apache2/auth
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - httpd_users:/usr/local/apache2/auth
         environment:
         - PUBLIC_ROOT_DIR=/storage


@@ -21,11 +21,5 @@ services:
         networks:
         - proxy
 volumes:
         networks:
         - proxy
 volumes:

-    public_data:
-        driver: local
-        driver_opts:
-            o: bind
-            type: none
-            device: /mnt/public_data

     httpd_users:
         driver: local
     httpd_users:
         driver: local

diff --git a/docker-compose.yml b/docker-compose.yml
index 7a29ceaa81357dbe93051e692a391a0d3ccb5335..ac2dc3d9a4f60ccda04a36b3d35ae25559253c6a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
         build: .
         image: cjpalmer/public:1.2.3
         volumes:
         build: .
         image: cjpalmer/public:1.2.3
         volumes:

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

         - public_data:/usr/local/apache2/htdocs
         - httpd_users:/usr/local/apache2/auth
         - ./lua:/usr/local/apache2/lua
         - public_data:/usr/local/apache2/htdocs
         - httpd_users:/usr/local/apache2/auth
         - ./lua:/usr/local/apache2/lua