From e9d21e9b99bbf91f885a3852277320895713e6b0 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Fri, 9 Jul 2021 11:06:40 +0100
Subject: [PATCH] replace hardcoded registry with variable
---
build/ci/.build-container.yml | 4 ++--
build/ci/.test.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index 68bc705e0..84f616335 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -39,5 +39,5 @@ build-docker:
- docker push $DOCKER_IMAGE_SHA
- docker tag $DOCKER_IMAGE_SHA $TAG
- docker push $TAG
- - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} .
- - docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
\ No newline at end of file
+ - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} .
+ - docker push ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
\ No newline at end of file
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 106d29b78..833275837 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -1,5 +1,5 @@
.integration-test: &integration-test
- image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
+ image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
stage: integration-test
needs:
- job: "containerlab:deploy"
@@ -34,7 +34,7 @@ integration-test:api:
- go test -race -v -run TestApiIntegration
.test: &test
- image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
+ image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
stage: test
allow_failure: true
variables:
--
GitLab