From 5479f1029550dbb860e17c86a2603397e656da6d Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 8 Feb 2021 13:28:52 +0100
Subject: [PATCH] sdc.astron.nl => sdc-dev.astron.nl
---
.gitlab-ci.yml | 2 +-
atdb/{ => docker}/docker-compose-atdb-ldv-acc-cd.yml | 0
atdb/{ => docker}/docker-compose-atdb-ldv-acc.yml | 0
.../{docker-compose-cd.yml => docker/docker-compose-dev-cd.yml} | 2 +-
atdb/{docker-compose.yml => docker/docker-compose-dev.yml} | 2 +-
5 files changed, 3 insertions(+), 3 deletions(-)
rename atdb/{ => docker}/docker-compose-atdb-ldv-acc-cd.yml (100%)
rename atdb/{ => docker}/docker-compose-atdb-ldv-acc.yml (100%)
rename atdb/{docker-compose-cd.yml => docker/docker-compose-dev-cd.yml} (90%)
rename atdb/{docker-compose.yml => docker/docker-compose-dev.yml} (91%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01b861a5..b3a80a57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ docker-deploy-master:
- chmod 644 ~/.ssh/known_hosts
script:
- ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
- - ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-cd.yml up -d"
+ - ssh -o StrictHostKeyChecking=no vermaas@sdc.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-dev-cd.yml up -d"
when: manual
only:
- master
diff --git a/atdb/docker-compose-atdb-ldv-acc-cd.yml b/atdb/docker/docker-compose-atdb-ldv-acc-cd.yml
similarity index 100%
rename from atdb/docker-compose-atdb-ldv-acc-cd.yml
rename to atdb/docker/docker-compose-atdb-ldv-acc-cd.yml
diff --git a/atdb/docker-compose-atdb-ldv-acc.yml b/atdb/docker/docker-compose-atdb-ldv-acc.yml
similarity index 100%
rename from atdb/docker-compose-atdb-ldv-acc.yml
rename to atdb/docker/docker-compose-atdb-ldv-acc.yml
diff --git a/atdb/docker-compose-cd.yml b/atdb/docker/docker-compose-dev-cd.yml
similarity index 90%
rename from atdb/docker-compose-cd.yml
rename to atdb/docker/docker-compose-dev-cd.yml
index c6bb0c0c..c512b081 100644
--- a/atdb/docker-compose-cd.yml
+++ b/atdb/docker/docker-compose-dev-cd.yml
@@ -34,7 +34,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
- "traefik.http.routers.atdb-backend.service=atdb-backend"
- - "traefik.http.routers.atdb-backend.rule=Host(`sdc.astron.nl`) && PathPrefix(`/atdb`)"
+ - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
- "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
depends_on:
diff --git a/atdb/docker-compose.yml b/atdb/docker/docker-compose-dev.yml
similarity index 91%
rename from atdb/docker-compose.yml
rename to atdb/docker/docker-compose-dev.yml
index 7bc50222..0dd72dd8 100644
--- a/atdb/docker-compose.yml
+++ b/atdb/docker/docker-compose-dev.yml
@@ -40,7 +40,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.atdb-backend.entryPoints=atdb-ldv"
- "traefik.http.routers.atdb-backend.service=atdb-backend"
- - "traefik.http.routers.atdb-backend.rule=Host(`sdc.astron.nl`) && PathPrefix(`/atdb`)"
+ - "traefik.http.routers.atdb-backend.rule=Host(`sdc-dev.astron.nl`) && PathPrefix(`/atdb`)"
- "traefik.http.services.atdb-backend.loadbalancer.server.port=8000"
depends_on:
--
GitLab