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

FIX: remove old user and enable cached dind

parent 90953be6
No related branches found
No related tags found
No related merge requests found
...@@ -22,10 +22,6 @@ variables: ...@@ -22,10 +22,6 @@ variables:
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv
# 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.0-dind
image: $CI_REGISTRY_IMAGE:latest image: $CI_REGISTRY_IMAGE:latest
...@@ -58,9 +54,8 @@ trigger_build: ...@@ -58,9 +54,8 @@ trigger_build:
tags: [ docker ] tags: [ docker ]
stage: deploy stage: deploy
script: script:
- echo $TOKEN
- /usr/bin/curl -X POST - /usr/bin/curl -X POST
-F token=$TOKEN -F token=$DEPLOY_TRIGGER_TOKEN
-F "variables[PYLIB]=$CI_COMMIT_REF_NAME" -F "variables[PYLIB]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=PYLIB" -F "variables[TriggerdBy]=PYLIB"
-F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA" -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA"
...@@ -68,14 +63,14 @@ trigger_build: ...@@ -68,14 +63,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: only:
- schedules - schedules
script: script:
- cd unittests/docker - 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... # use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE:latest || true - docker pull $CI_REGISTRY_IMAGE:latest || 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