From 70392dfbfbb3616c325589fe7399c395ed3c9ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Sun, 29 Dec 2019 12:52:20 +0000
Subject: [PATCH] ENH: enable cached image building
---
.gitlab-ci.yml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1802b5bb..bb05c265 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,6 @@ variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
- DOCKER_DRIVER: overlay2
-
-services:
- - docker:19.03-dind
image: $CI_REGISTRY_IMAGE
stages:
@@ -55,7 +51,7 @@ trigger_build:
stage: deploy
script:
- /usr/bin/curl -X POST
- -F token=8f29e5eeb7db2123d9c2bb84634da2
+ -F token=$DEPLOY_TRIGGER_TOKEN
-F "variables[SERVER]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=SERVER"
-F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
@@ -63,12 +59,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 src/test/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 || true
- docker build
--
GitLab