From be813a2d81e04f8ba62f5b550a1991f535337a67 Mon Sep 17 00:00:00 2001 From: James Scherer Date: Wed, 22 May 2024 15:59:40 -0500 Subject: [PATCH] Making a staging docker-compose.yml for deploying the development version of Rosalution (#174) * changed development to staging * removed the original staging yml and changed the production yml to be staging with tls * Updated the github runner workflow to use staging instead of production yml --- .github/workflows/development-main-deployment.yml | 2 +- ...-compose.production.yml => docker-compose.staging.yml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename docker-compose.production.yml => docker-compose.staging.yml (92%) diff --git a/.github/workflows/development-main-deployment.yml b/.github/workflows/development-main-deployment.yml index 5c651161..c8fb27fc 100644 --- a/.github/workflows/development-main-deployment.yml +++ b/.github/workflows/development-main-deployment.yml @@ -25,4 +25,4 @@ jobs: uses: actions/checkout@v3 - name: Deploy Production Rosalution Build to Developer DevOps Server - run: sudo -E docker stack deploy --prune --with-registry-auth --compose-file docker-compose.production.yml rosalution-prod + run: sudo -E docker stack deploy --prune --with-registry-auth --compose-file docker-compose.staging.yml rosalution-prod diff --git a/docker-compose.production.yml b/docker-compose.staging.yml similarity index 92% rename from docker-compose.production.yml rename to docker-compose.staging.yml index da5fa03b..2d9ccfff 100644 --- a/docker-compose.production.yml +++ b/docker-compose.staging.yml @@ -1,5 +1,3 @@ -version: '3.5' - services: frontend: image: ghcr.io/uab-cgds-worthey/rosalution/frontend:${ROSALUTION_VERSION} @@ -10,7 +8,7 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=traefik-public" - - "traefik.http.routers.rosalution-frontend-prod-router.entrypoints=http" + - "traefik.http.routers.rosalution-frontend-prod-router.tls=true" - "traefik.http.routers.rosalution-frontend-prod-router.rule=Host(`dev.cgds.uab.edu`) && PathPrefix(`/rosalution`)" - "traefik.http.routers.rosalution-frontend-prod-router.service=rosalution-frontend-prod-service" - "traefik.http.routers.rosalution-frontend-prod-router.middlewares=frontend-strip-prefix" @@ -31,7 +29,7 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=traefik-public" - - "traefik.http.routers.rosalution-backend-prod-router.entrypoints=http" + - "traefik.http.routers.rosalution-backend-prod-router.tls=true" - "traefik.http.routers.rosalution-backend-prod-router.rule=Host(`dev.cgds.uab.edu`) && PathPrefix(`/rosalution/api`)" - "traefik.http.routers.rosalution-backend-prod-router.service=rosalution-backend-prod-service" - "traefik.http.routers.rosalution-backend-prod-router.middlewares=backend-strip-prefix" @@ -40,7 +38,8 @@ services: networks: rosalution-network: - name: rosalution-network-prod + name: rosalution-network-dev + external: true traefik: name: traefik-public external: true