From 66c0151842e9434cdd615b8c0c4268dd9a5e9582 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Sun, 21 Apr 2024 02:18:33 +0200 Subject: [PATCH] fix:#59 fixed image tag --- .gitlab-ci.yml | 2 +- docker-compose.dev.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c7798f..91a102e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,7 @@ deploy-dev: - ssh-add <(echo "$CI_SSH_KEY" | tr -d '\r') script: # replace some placeholders - - sed -i -e "s|REGISTRY_REPO|$CI_REGISTRY_REPO|" docker-compose.dev.yml # Assuming you have a separate docker-compose file for development + - sed -i -e "s|DOCKER_REGISTRY_REPO|$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG|" docker-compose.dev.yml # Assuming you have a separate docker-compose file for development # upload necessary files to the dev server - > scp -P $CI_SSH_PORT -o StrictHostKeyChecking=no -o LogLevel=ERROR ./docker-compose.dev.yml ./reverseproxy.dev.conf diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f0146e2..7e96d54 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -16,7 +16,7 @@ services: htwkalender-backend: - image: DOCKER_REGISTRY_REPO:backend # DOCKER_REGISTRY_REPO will be replaced by CI + image: DOCKER_REGISTRY_REPO-backend # DOCKER_REGISTRY_REPO will be replaced by CI command: "--http=0.0.0.0:8090 --dir=/htwkalender/data/pb_data" pull_policy: always restart: always @@ -26,7 +26,7 @@ services: - "net" htwkalender-frontend: - image: DOCKER_REGISTRY_REPO:frontend # DOCKER_REGISTRY_REPO will be replaced by CI + image: DOCKER_REGISTRY_REPO-frontend # DOCKER_REGISTRY_REPO will be replaced by CI pull_policy: always restart: always depends_on: