From 8631ae0b3ce4302ef7bfec42b453896e4ee3374f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 21 Feb 2020 12:19:48 +0100
Subject: [PATCH] FIX: registry use
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5935112..57416842 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,11 +19,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
variables:
- CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv
+ CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-pylib/testenv:latest
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
-image: $CI_REGISTRY_IMAGE:latest
+image: $CI_REGISTRY_IMAGE
stages:
- code_style
@@ -77,12 +77,12 @@ build-testenv:
- schedules
script:
- cd unittests/docker
- - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# use here general latest or specific branch latest...
- - docker pull $CI_REGISTRY_IMAGE:latest || true
+ - docker pull $CI_REGISTRY_IMAGE|| true
- docker build
--pull
--build-arg COMMIT=$CI_COMMIT_SHORT_SHA
- --cache-from $CI_REGISTRY_IMAGE:latest
- -t $CI_REGISTRY_IMAGE:latest .
- - docker push $CI_REGISTRY_IMAGE:latest
+ --cache-from $CI_REGISTRY_IMAGE
+ -t $CI_REGISTRY_IMAGE .
+ - docker push $CI_REGISTRY_IMAGE
--
GitLab