Updated to 1.7.0

[web-gallery.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 88d1329db236c7c4e33c6b2d08f62e5f58d1ae8c..f6334cebfc9713c2ad146c4406dffe21366bd755 100644 (file)
--- 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.7.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.7.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:0.1.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