Updated public with 1.1.0

[proxy.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 12ff6bb8a387b260f50e1f6ec21d2cc293e43cb8..2a6945bf128299477153adc812d9e084a8f617af 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,41 +9,35 @@ version: '3'
 services:
     proxy:
         image: nginx:1.17
 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
         volumes:
         - ./proxy/nginx.conf:/etc/nginx/nginx.conf

+        - /etc/ssl/certs/purplebirdman/:/etc/ssl/certs/

         environment:
         - NGINX_HOST=purplebirdman.com
         environment:
         - NGINX_HOST=purplebirdman.com

-        - NGINX_PORT=80
+        - NGINX_PORT=443

         ports:
         ports:

-        - 80:80

         - 443:443
         - 443:443

+        depends_on:
+        - purplebirdman
+        - kanboard
+        - public
+    purplebirdman:
+        image: cjpalmer/purplebirdman:1.0.0

     kanboard:
         image: kanboard/kanboard:v1.2.26
     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:
         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.1.0

         volumes:
         - ${LOCAL_STORAGE}:/storage
         - public_data:/usr/local/apache2/htdocs
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs
         volumes:
         - ${LOCAL_STORAGE}:/storage
         - public_data:/usr/local/apache2/htdocs
         environment:
         - PUBLIC_ROOT_DIR=/storage
         - PUBLIC_LINK_DIR=/usr/local/apache2/htdocs

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

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


@@ -57,3 +51,7 @@ volumes:
         driver: local
     public_data:
         driver: local
         driver: local
     public_data:
         driver: local

+        driver_opts:
+            o: bind
+            type: none
+            device: /mnt/public_data