Skip to content
Snippets Groups Projects
Commit 40211c62 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'fix-cache-ci' into 'dev'

ENH: enable cached image building

See merge request caosdb/caosdb-server!24
parents 394cad63 70392dfb
Branches
Tags
No related merge requests found
...@@ -26,10 +26,6 @@ variables: ...@@ -26,10 +26,6 @@ variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-server-testenv:latest
# When using dind, it's wise to use the overlayfs driver for # When using dind, it's wise to use the overlayfs driver for
# improved performance. # improved performance.
DOCKER_DRIVER: overlay2
services:
- docker:19.03-dind
image: $CI_REGISTRY_IMAGE image: $CI_REGISTRY_IMAGE
stages: stages:
...@@ -55,7 +51,7 @@ trigger_build: ...@@ -55,7 +51,7 @@ trigger_build:
stage: deploy stage: deploy
script: script:
- /usr/bin/curl -X POST - /usr/bin/curl -X POST
-F token=8f29e5eeb7db2123d9c2bb84634da2 -F token=$DEPLOY_TRIGGER_TOKEN
-F "variables[SERVER]=$CI_COMMIT_REF_NAME" -F "variables[SERVER]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=SERVER" -F "variables[TriggerdBy]=SERVER"
-F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA" -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
...@@ -63,12 +59,14 @@ trigger_build: ...@@ -63,12 +59,14 @@ trigger_build:
# Build a docker image in which tests for this repository can run # Build a docker image in which tests for this repository can run
build-testenv: build-testenv:
tags: [ docker ] tags: [ cached-dind ]
image: docker:19.03 image: docker:19.03
stage: setup stage: setup
only:
- schedules
script: script:
- cd src/test/docker - 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... # use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE || true - docker pull $CI_REGISTRY_IMAGE || true
- docker build - docker build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment