From bf860c26c6df65efb5f5788f943bbea2e611c142 Mon Sep 17 00:00:00 2001 From: schnarkus <markus.simianer@yahoo.de> Date: Sun, 25 Aug 2024 11:05:17 +0200 Subject: [PATCH] add namespace --- .gitlab-ci.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b262b2..9880b16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,8 @@ variables: version: 0.0.$CI_PIPELINE_IID environment_tag: | if [ "$CI_COMMIT_BRANCH" == "prod" ]; then echo "prod"; else echo "dev"; fi + registry_url: registry.bht-berlin.de:443 + image_name: masi9606/webservice stages: - test @@ -34,11 +36,11 @@ build_job: tags: - docker-privileged script: - - docker build -t $CI_REGISTRY_IMAGE:$version -f Containerfile . + - docker build -t $registry_url/$image_name:$version -f Containerfile . artifacts: paths: - artifact.bin - expire_in: 5 min + expire_in: 30 min tag_job: stage: tag @@ -53,8 +55,8 @@ tag_job: dependencies: - build_job script: - - docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:latest - - docker tag $CI_REGISTRY_IMAGE:$version $CI_REGISTRY_IMAGE:$environment_tag + - docker tag $registry_url/$image_name:$version $registry_url/$image_name:latest + - docker tag $registry_url/$image_name:$version $registry_url/$image_name:$environment_tag publish_job: stage: publish @@ -69,9 +71,9 @@ publish_job: dependencies: - tag_job script: - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - - docker push $CI_REGISTRY_IMAGE:$version - - docker push $CI_REGISTRY_IMAGE:latest - - docker push $CI_REGISTRY_IMAGE:$environment_tag + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $registry_url + - docker push $registry_url/$image_name:$version + - docker push $registry_url/$image_name:latest + - docker push $registry_url/$image_name:$environment_tag after_script: - - docker logout $CI_REGISTRY + - docker logout $registry_url -- GitLab