X-Git-Url: http://git.purplebirdman.com/web-gallery.git/blobdiff_plain/7deeaa829328f71e5ce2ef03c1c20c56519369b6..cf6768b36c026710fffa028c42d0b888c4562fee:/docker-compose.yml?ds=sidebyside

diff --git a/docker-compose.yml b/docker-compose.yml
index 0dcd450..8f126f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,35 +1,26 @@
 version: '3'
 services:
-    db:
-        image: postgres:13.4-alpine
+    navigator:
+        build: ./navigator
+        image: cjpalmer/gallery-navigator:1.4.0
+        volumes:
+#       - ./navigator/app:/app # dev testing
+        - gallery_data_dev:/app/gallery
         environment:
-            POSTGRES_USER: admin
-            POSTGRES_PASSWORD: adminpw
-        ports:
-        - 5432:5432
-    web:
-        image: nginx:1.17
+            FLASK_DEBUG: 1
+    server:
+        build: ./server
+        image: cjpalmer/gallery-server:1.4.0
         volumes:
-        - ./nginx.conf:/etc/nginx/nginx.conf
-        - gallery_data:/data/images
+        - gallery_data_dev:/data/images
         ports:
         - 80:80
         depends_on:
-        - gallery
-    gallery:
-        build: .
-        image: cjpalmer/gallery:1.0.0
-        volumes:
-        - gallery_data:/app/gallery
-        - ./app:/app
-        environment:
-            FLASK_DEBUG: 1
-        depends_on:
-        - db
+        - navigator
 volumes:
-    gallery_data:
+    gallery_data_dev:
         driver: local
         driver_opts:
             o: bind
             type: none
-            device: /mnt/gallery_data
+            device: /mnt/gallery_data_dev