diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13bfb556ebc366342465efb6d575b5bdec7c2d5b..f3713843dd321f41b4b67701fda4464fe634954f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ docker-deploy-main-test: - scp -o StrictHostKeyChecking=no docker/docker-compose-dev-cd.yml sdc@dop814.astron.nl:/docker_compose/adex-backend-fastapi/docker-compose-dev-cd.yml - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY" - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE"" - - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p adex-backend-fastapi -f /docker_compose/adex-backend-fastapi/docker-compose-dev-cd.yml up -d" + - ssh -o StrictHostKeyChecking=no sdc@dop814.astron.nl "docker-compose -p adex-backend -f /docker_compose/adex-backend-fastapi/docker-compose-dev-cd.yml up -d" - echo "Application deployed" when: manual only: @@ -119,7 +119,7 @@ docker-deploy-main-production: - scp -o StrictHostKeyChecking=no docker/docker-compose-production-cd.yml sdco@dop821.astron.nl:/opt/dockercompose/adex-backend-fastapi/docker-compose-production-cd.yml - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY" - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker pull "$CI_REGISTRY_IMAGE"" - - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p adex-backend-fastapi -f /opt/dockercompose/adex-backend-fastapi/docker-compose-production-cd.yml up -d" + - ssh -o StrictHostKeyChecking=no sdco@dop821.astron.nl "docker-compose -p adex-backend -f /opt/dockercompose/adex-backend-fastapi/docker-compose-production-cd.yml up -d" - echo "Application deployed" when: manual only: diff --git a/docker/docker-compose-dev-cd.yml b/docker/docker-compose-dev-cd.yml index 667ce7aef86153ae3647ee4032011c5376c14951..a21855b0bab052fef752f273b4f5d11530a19732 100644 --- a/docker/docker-compose-dev-cd.yml +++ b/docker/docker-compose-dev-cd.yml @@ -36,10 +36,10 @@ services: - adex_network labels: - "traefik.enable=true" - - "traefik.http.routers.ldv-specification.entryPoints=websecure" - - "traefik.http.routers.ldv-specification.service=adex-backend-fastapi" - - "traefik.http.routers.ldv-specification.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/adex-backend-fastapi`)" - - "traefik.http.services.ldv-specification.loadbalancer.server.port=8000" + - "traefik.http.routers.adex-backend-fastapi.entryPoints=websecure" + - "traefik.http.routers.adex-backend-fastapi.service=adex-backend-fastapi" + - "traefik.http.routers.adex-backend-fastapi.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/adex-backend-fastapi`)" + - "traefik.http.services.adex-backend-fastapi.loadbalancer.server.port=8000" depends_on: - adex-cache-db diff --git a/docker/docker-compose-production-cd.yml b/docker/docker-compose-production-cd.yml index 5bd86d121f37f2661d67a66a9972ce88bed4f834..708eff62355aa8db5d26b73c8c2bb45779a75640 100644 --- a/docker/docker-compose-production-cd.yml +++ b/docker/docker-compose-production-cd.yml @@ -36,10 +36,10 @@ services: - adex_network labels: - "traefik.enable=true" - - "traefik.http.routers.ldv-specification.entryPoints=websecure" - - "traefik.http.routers.ldv-specification.service=adex-backend-fastapi" - - "traefik.http.routers.ldv-specification.rule=Host(`sdc.astron.nl`) && PathPrefix(`/adex-backend-fastapi`)" - - "traefik.http.services.ldv-specification.loadbalancer.server.port=8000" + - "traefik.http.routers.adex-backend-fastapi.entryPoints=websecure" + - "traefik.http.routers.adex-backend-fastapi.service=adex-backend-fastapi" + - "traefik.http.routers.adex-backend-fastapi.rule=Host(`sdc.astron.nl`) && PathPrefix(`/adex-backend-fastapi`)" + - "traefik.http.services.adex-backend-fastapi.loadbalancer.server.port=8000" depends_on: - adex-cache-db