From c2a2f1a59ca0b9f15d5ad47cf8eae2290059091b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Thu, 18 Jul 2019 11:48:17 +0200
Subject: [PATCH] ci
---
.docker/docker-compose.yml | 2 +-
.gitlab-ci.yml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index facbe4d..18a7746 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
environment:
MYSQL_ROOT_PASSWORD: caosdb1234
caosdb-server:
- image: "caosdb:default"
+ image: "$CI_REGISTRY/caosdb:$CAOSDB_TAG"
depends_on:
- sqldb
ports:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7495058..4c941bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,7 @@ variables:
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
DOCKER_DRIVER: overlay2
+ CAOSDB_TAG: latest
services:
- docker:dind
@@ -56,6 +57,7 @@ test:
name: docker/compose:1.24.1
entrypoint: ["/bin/sh", "-c"]
script:
+ - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker-compose -f .docker/docker-compose.yml up
build-testenv:
--
GitLab