From 57efc060a9d73f4fa7182acc168d45788543130f Mon Sep 17 00:00:00 2001 From: John Gomersall Date: Mon, 2 Oct 2023 13:38:45 +0100 Subject: [PATCH] Remove docker network for production deployment --- .github/workflows/container-deploy.yml | 2 +- README.md | 2 +- docker/prod.yml | 13 ------------- package.json | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 docker/prod.yml diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml index d49fb10..7867afa 100644 --- a/.github/workflows/container-deploy.yml +++ b/.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;docker/prod.yml" >> .env + echo "COMPOSE_FILE=docker-compose.yml" >> .env echo "TAG=sha-${{ github.sha }}" >> .env # App environment variables diff --git a/README.md b/README.md index 3b0b113..7b176e3 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ docker-compose up -d --build The main docker-compose.yml creates the openfoodfacts-query service and associated Postres database and expects MongoDB to already exist. -The dev.yml Docker Compose joins the services to the po_default network to ease communication with Product Opener and MongoDB. The prod.yml uses the po_webnet network. +The dev.yml Docker Compose joins the services to the po_default network to ease communication with Product Opener and MongoDB. In staging and production comminication with MongoDB is done with an explicity network address. # Use diff --git a/docker/prod.yml b/docker/prod.yml deleted file mode 100644 index 13dcce9..0000000 --- a/docker/prod.yml +++ /dev/null @@ -1,13 +0,0 @@ -services: - query_postgres: - networks: - - webnet - - query: - networks: - - webnet - -networks: - webnet: - external: true - name: po_webnet diff --git a/package.json b/package.json index 6128e31..6bea586 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openfoodfacts-query", - "version": "0.0.1", + "version": "0.0.2", "description": "", "author": "", "private": true,