Hotfix for public 1.2.2

[proxy.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index f3e2b500932ba708931d3fbfbe4adb48485fb214..fec3730b8e32650111d6cb2961bfa08e5b5c6885 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,58 @@
+# requires variable config loading, such as:
+# docker stack deploy -c <(docker-compose config) purplebirdman
+#
+# also needs an .env file with some variables!
+

 version: '3'
 version: '3'

-networks:
-    proxy:
-        external:
-            name: proxy

 services:
     proxy:
         image: nginx:1.17
         volumes:
 services:
     proxy:
         image: nginx:1.17
         volumes:

-        - ./nginx.conf:/etc/nginx/nginx.conf
+        - ./proxy/nginx.conf:/etc/nginx/nginx.conf
+        - /etc/ssl/certs/purplebirdman/:/etc/ssl/certs/

         environment:
         environment:

-        - NGINX_HOST=purplebirdman.online
-        - NGINX_PORT=80
+        - NGINX_HOST=purplebirdman.com
+        - NGINX_PORT=443

         ports:
         ports:

-        - 8080:80
-        networks:
-        - default
-        - proxy
+        - 443:443
+        depends_on:
+        - purplebirdman
+        - kanboard
+        - public
+    purplebirdman:
+        image: cjpalmer/purplebirdman:1.0.0
+    kanboard:
+        image: kanboard/kanboard:v1.2.26
+        volumes:
+        - kanboard_data:/var/www/app/data
+        - kanboard_plugins:/var/www/app/plugins
+        - kanboard_ssl:/etc/nginx/ssl
+    public:
+        image: cjpalmer/public:1.2.2
+        volumes:
+        - ${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_FQDN_OVERRIDE=https://public.purplebirdman.com
+volumes:
+    kanboard_data:
+        driver: local
+        driver_opts:
+            o: bind
+            type: none
+            device: /mnt/kanboard_data
+    kanboard_plugins:
+        driver: local
+    kanboard_ssl:
+        driver: local
+    public_data:
+        driver: local
+        driver_opts:
+            o: bind
+            type: none
+            device: /mnt/public_data
+    httpd_users:
+        driver: local