Use PO webnet network in staging

.github/workflows/container-deploy.yml

@@ -106,7 +106,7 @@ jobs:
             echo "COMPOSE_HTTP_TIMEOUT=120" >> .env
             echo "COMPOSE_PROJECT_NAME=off-query" >> .env
             echo "COMPOSE_PATH_SEPARATOR=;" >> .env
-            echo "COMPOSE_FILE=docker-compose.yml" >> .env
+            echo "COMPOSE_FILE=docker-compose.yml;docker/prod.yml" >> .env
             echo "TAG=sha-${{ github.sha }}" >> .env
 
             # App environment variables

docker-compose.yml

@@ -7,8 +7,6 @@ services:
       - POSTGRES_DB
     volumes:
       - dbdata:/var/lib/postgresql/data
-    networks:
-      - po_default
 
   query:
     image: ghcr.io/openfoodfacts/openfoodfacts-query:${TAG}
@@ -19,16 +17,9 @@ services:
       - POSTGRES_USER
       - POSTGRES_PASSWORD
       - MONGO_URI
-    networks:
-      - po_default
     depends_on:
       query_postgres:
         condition: service_started
 
-networks:
-  po_default:
-    external: true
-    name: po_default
-
 volumes:
   dbdata:

docker/dev.yml

@@ -5,6 +5,8 @@ services:
       - 5512:5432
     volumes:
       - ./data:/mnt/data
+    networks:
+      - po_default
 
   query:
     build: .
@@ -18,3 +20,10 @@ services:
       - 5511:5510
     volumes:
       - ./data:/data
+    networks:
+      - po_default
+
+networks:
+  po_default:
+    external: true
+    name: po_default

docker/prod.yml

@@ -0,0 +1,13 @@
+services:
+  query_postgres:
+    networks:
+      - webnet
+
+  query:
+    networks:
+      - webnet
+
+networks:
+  webnet:
+    external: true
+    name: po_webnet