From ef168317dda4c164f5a42a0858cd634df1366afd 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:30:15 +0100
Subject: [PATCH] FIX: registry use
---
.docker/docker-compose.yml | 2 +-
.gitlab-ci.yml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 56c068e..1d0cd73 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -7,7 +7,7 @@ services:
networks:
- caosnet
caosdb-server:
- image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG"
+ image: "$CI_REGISTRY_INDISCALE/caosdb/src/caosdb-deploy:$CAOSDB_TAG"
user: 999:999
depends_on:
- sqldb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be3c255..22f0c08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
variables:
- CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pyint-testenv
+ CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-pyinttest/testenv
stages:
- setup
@@ -92,7 +92,7 @@ test:
- time docker load < /image-cache/caosdb-pyint-testenv.tar || true
- time docker load < /image-cache/mariadb.tar || true
- time docker load < /image-cache/caosdb.tar || true
- - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE:latest
- cd .docker
# here the server and the mysql backend docker are being started
@@ -103,6 +103,7 @@ test:
- cd ..
- docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
- docker logs docker_sqldb_1 &> ../mariadb_log.txt
+ - docker login -u $INDISCALE_USER -p $INDISCALE_TOKEN $CI_REGISTRY_INDISCALE
- docker-compose -f .docker/docker-compose.yml down
- rc=`cat .docker/result`
- exit $rc
--
GitLab