From: Clifton Palmer Date: Fri, 3 Nov 2023 19:33:20 +0000 (-0500) Subject: Updated local compose variables X-Git-Tag: 1.3.0~1 X-Git-Url: http://git.purplebirdman.com/public.git/commitdiff_plain/fdf37aa5477e52c1058efac1638e5efabf6d78d6?ds=sidebyside;hp=ce8a51d16feef96ed9f28c162c4996b0256f09b5 Updated local compose variables --- diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 79bcf02..6ecf001 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -1,5 +1,5 @@ # 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! @@ -8,11 +8,11 @@ networks: proxy: external: true services: - public: + web: 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 @@ -21,11 +21,5 @@ services: networks: - proxy volumes: - public_data: - driver: local - driver_opts: - o: bind - type: none - device: /mnt/public_data httpd_users: driver: local diff --git a/docker-compose.yml b/docker-compose.yml index 7a29cea..ac2dc3d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: 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