From c560db8adfbdeeab93ef0daa2e78542e400c9297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Sun, 29 Dec 2019 14:16:37 +0100
Subject: [PATCH] FIX: remove old user and enable cached dind
---
.gitlab-ci.yml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 491fdace..f5412d02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,10 +22,6 @@ variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
- DOCKER_DRIVER: overlay2
-
-services:
- - docker:19.03.0-dind
image: $CI_REGISTRY_IMAGE:latest
@@ -58,9 +54,8 @@ trigger_build:
tags: [ docker ]
stage: deploy
script:
- - echo $TOKEN
- /usr/bin/curl -X POST
- -F token=$TOKEN
+ -F token=$DEPLOY_TRIGGER_TOKEN
-F "variables[PYLIB]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=PYLIB"
-F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
@@ -68,14 +63,14 @@ trigger_build:
# Build a docker image in which tests for this repository can run
build-testenv:
- tags: [ docker ]
+ tags: [ cached-dind ]
image: docker:19.03
stage: setup
only:
- schedules
script:
- cd unittests/docker
- - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true
- docker build
--
GitLab