From 283ec9540c4bd6a5d650ad960f1660305210e9e6 Mon Sep 17 00:00:00 2001 From: Nikhil Shahi Date: Mon, 17 Oct 2022 17:12:28 -0500 Subject: [PATCH 1/2] add staging docker-compose file --- docker-compose-staging.yaml | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docker-compose-staging.yaml diff --git a/docker-compose-staging.yaml b/docker-compose-staging.yaml new file mode 100644 index 00000000..f8271821 --- /dev/null +++ b/docker-compose-staging.yaml @@ -0,0 +1,74 @@ +version: "3.9" + +services: + db: + image: postgres:14.4-alpine + restart: unless-stopped + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + volumes: + - db:/var/lib/postgresql/data + - ./init.sql:/docker-entrypoint-initdb.d/init_db.sql + ingestor: + image: metlo/backend:staging + command: yarn start-collector + container_name: metlo-ingestor + depends_on: + - db + - cache + restart: unless-stopped + ports: + - 8081:8081 + environment: + - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security + - ENCRYPTION_KEY=${ENCRYPTION_KEY} + - RUN_MIGRATION=true + volumes: + - ./metlo-config.yaml:/usr/src/app/backend/metlo-config.yaml + cache: + image: redis:7.0.4 + restart: always + command: redis-server --save 20 1 --loglevel warning --requirepass eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81 + volumes: + - cache:/data + backend: + image: metlo/backend:staging + container_name: metlo-backend + restart: unless-stopped + depends_on: + - db + - cache + ports: + - 8080:8080 + environment: + - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security + - REDIS_URL=redis://:eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81@cache:6379 + - ENCRYPTION_KEY=${ENCRYPTION_KEY} + - BACKEND_URL=${BACKEND_URL} + - EXPRESS_SECRET=${EXPRESS_SECRET} + - SESSION_SECRET=${EXPRESS_SECRET} + - SANDBOX_MODE=${SANDBOX_MODE} + jobs: + image: metlo/jobrunner:staging + container_name: metlo-jobs + depends_on: + - ingestor + restart: unless-stopped + environment: + - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security + - DISABLE_LOGGING_STATS=${DISABLE_LOGGING_STATS} + frontend: + image: metlo/frontend:staging + container_name: metlo-frontend + restart: unless-stopped + environment: + - BACKEND_URL=http://backend:8080 + ports: + - 8000:3000 + +volumes: + db: + driver: local + cache: + driver: local From b1a43cb7f37446ac02954a56efac0d002de9aba3 Mon Sep 17 00:00:00 2001 From: Nikhil Shahi Date: Mon, 17 Oct 2022 17:27:13 -0500 Subject: [PATCH 2/2] remove extra file, update image value with env var --- docker-compose-staging.yaml | 74 ------------------------------------- docker-compose.yaml | 8 ++-- 2 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 docker-compose-staging.yaml diff --git a/docker-compose-staging.yaml b/docker-compose-staging.yaml deleted file mode 100644 index f8271821..00000000 --- a/docker-compose-staging.yaml +++ /dev/null @@ -1,74 +0,0 @@ -version: "3.9" - -services: - db: - image: postgres:14.4-alpine - restart: unless-stopped - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - volumes: - - db:/var/lib/postgresql/data - - ./init.sql:/docker-entrypoint-initdb.d/init_db.sql - ingestor: - image: metlo/backend:staging - command: yarn start-collector - container_name: metlo-ingestor - depends_on: - - db - - cache - restart: unless-stopped - ports: - - 8081:8081 - environment: - - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security - - ENCRYPTION_KEY=${ENCRYPTION_KEY} - - RUN_MIGRATION=true - volumes: - - ./metlo-config.yaml:/usr/src/app/backend/metlo-config.yaml - cache: - image: redis:7.0.4 - restart: always - command: redis-server --save 20 1 --loglevel warning --requirepass eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81 - volumes: - - cache:/data - backend: - image: metlo/backend:staging - container_name: metlo-backend - restart: unless-stopped - depends_on: - - db - - cache - ports: - - 8080:8080 - environment: - - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security - - REDIS_URL=redis://:eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81@cache:6379 - - ENCRYPTION_KEY=${ENCRYPTION_KEY} - - BACKEND_URL=${BACKEND_URL} - - EXPRESS_SECRET=${EXPRESS_SECRET} - - SESSION_SECRET=${EXPRESS_SECRET} - - SANDBOX_MODE=${SANDBOX_MODE} - jobs: - image: metlo/jobrunner:staging - container_name: metlo-jobs - depends_on: - - ingestor - restart: unless-stopped - environment: - - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security - - DISABLE_LOGGING_STATS=${DISABLE_LOGGING_STATS} - frontend: - image: metlo/frontend:staging - container_name: metlo-frontend - restart: unless-stopped - environment: - - BACKEND_URL=http://backend:8080 - ports: - - 8000:3000 - -volumes: - db: - driver: local - cache: - driver: local diff --git a/docker-compose.yaml b/docker-compose.yaml index 7b0c3658..5788831b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,7 @@ services: - db:/var/lib/postgresql/data - ./init.sql:/docker-entrypoint-initdb.d/init_db.sql ingestor: - image: metlo/backend + image: metlo/backend:${DOCKER_IMAGE_TAG:-latest} command: yarn start-collector container_name: metlo-ingestor depends_on: @@ -33,7 +33,7 @@ services: volumes: - cache:/data backend: - image: metlo/backend + image: metlo/backend:${DOCKER_IMAGE_TAG:-latest} container_name: metlo-backend restart: unless-stopped depends_on: @@ -50,7 +50,7 @@ services: - SESSION_SECRET=${EXPRESS_SECRET} - SANDBOX_MODE=${SANDBOX_MODE} jobs: - image: metlo/jobrunner + image: metlo/jobrunner:${DOCKER_IMAGE_TAG:-latest} container_name: metlo-jobs depends_on: - ingestor @@ -59,7 +59,7 @@ services: - DB_URL=postgres://postgres:postgres@db:5432/metlo_api_security - DISABLE_LOGGING_STATS=${DISABLE_LOGGING_STATS} frontend: - image: metlo/frontend + image: metlo/frontend:${DOCKER_IMAGE_TAG:-latest} container_name: metlo-frontend restart: unless-stopped environment: