From 5ae3335d66e12d3342a00afcf01a8585ef634d27 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Tue, 30 Aug 2022 16:20:34 +0200
Subject: [PATCH] fix traefik labels in compose files
---
.gitlab-ci.yml | 4 ++--
docker/docker-compose-dev-cd.yml | 8 ++++----
docker/docker-compose-production-cd.yml | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13bfb55..f371384 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 667ce7a..a21855b 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 5bd86d1..708eff6 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
--
GitLab