Updated navigator to version 1.2.0

* Added backend network to prod compose file
* Removed psycopg2 stuff

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 7e64b7f0e0f636078966ffa395fc8f438c3707f1..562597b8a5675f31f5997ae2a1414542070038f2 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -2,11 +2,15 @@ version: '3'
 networks:
     proxy:
         external: true
 networks:
     proxy:
         external: true

+    backend:
+        driver: overlay

 services:
     navigator:
 services:
     navigator:

-        image: cjpalmer/gallery-navigator:1.1.0
+        image: cjpalmer/gallery-navigator:1.2.0

         volumes:
         - gallery_data:/app/gallery
         volumes:
         - gallery_data:/app/gallery

+        networks:
+        - backend

     server:
         image: cjpalmer/gallery-server:1.1.0
         volumes:
     server:
         image: cjpalmer/gallery-server:1.1.0
         volumes:


@@ -14,7 +18,7 @@ services:
         depends_on:
         - navigator
         networks:
         depends_on:
         - navigator
         networks:

-        - default
+        - backend

         - proxy
 volumes:
     gallery_data:
         - proxy
 volumes:
     gallery_data:

diff --git a/docker-compose.yml b/docker-compose.yml
index 312c82d7508e09da56d79ebafb7db9a11477fdc0..985fbf411d06ef42e53c444bca2c89758c681c94 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     navigator:
         build: ./navigator
 services:
     navigator:
         build: ./navigator

-        image: cjpalmer/gallery-navigator:1.1.0
+        image: cjpalmer/gallery-navigator:1.2.0

         volumes:
         - gallery_data:/app/gallery
         environment:
         volumes:
         - gallery_data:/app/gallery
         environment:

diff --git a/navigator/Dockerfile b/navigator/Dockerfile
index 6591257b71010496cb10a8b0d023ffd91e415332..d8a4727eb20ddc2885b91198b4c8035d01187669 100644 (file)
--- a/navigator/Dockerfile
+++ b/navigator/Dockerfile
@@ -6,8 +6,7 @@ ENV FLASK_PORT=5000
 
 EXPOSE 5000
 
 
 EXPOSE 5000
 

-RUN apk update && \
-    apk add --no-cache gcc musl-dev linux-headers libpq-dev python3-dev
+RUN apk update

 
 WORKDIR /app
 COPY ./requirements.txt /app
 
 WORKDIR /app
 COPY ./requirements.txt /app

diff --git a/navigator/requirements.txt b/navigator/requirements.txt
index ec23c0a7d07962fb1314239f5e05e09f00ee5434..7e1060246fd6746a14204539a72e199a25469a05 100644 (file)
--- a/navigator/requirements.txt
+++ b/navigator/requirements.txt
@@ -1,2 +1 @@
-psycopg2

 flask
 flask