diff options
| author | Jonas Zohren <git-pbkyr@jzohren.de> | 2023-06-26 22:06:17 +0200 |
|---|---|---|
| committer | Jonas Zohren <git-pbkyr@jzohren.de> | 2023-06-26 22:26:33 +0200 |
| commit | 26b8605fa0483775acaa1a41dfada24d01cabb6f (patch) | |
| tree | 84d8104029aecfedca3cb200a5577b6335ebb55c /.gitlab-ci.yml | |
| parent | dbd360ebb9b74a598f16366e83dd907143659811 (diff) | |
| download | conduit-26b8605fa0483775acaa1a41dfada24d01cabb6f.zip | |
ci: Adjust to current docker
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7df56f..d2da91b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,19 +16,15 @@ variables: .docker-shared-settings: stage: "build docker image" - image: - name: jdrouet/docker-with-buildx:20.10.21-0.9.1 - pull_policy: if-not-present needs: [] tags: [ "docker" ] variables: # Docker in Docker: - DOCKER_HOST: tcp://docker:2375/ - DOCKER_TLS_CERTDIR: "" - # Famedly runners use BTRFS, overlayfs and overlay2 often break jobs - DOCKER_DRIVER: btrfs + DOCKER_BUILDKIT: 1 + image: + name: docker.io/docker services: - - name: docker:dind + - name: docker.io/docker:dind alias: docker script: - apk add openssh-client @@ -104,6 +100,13 @@ docker:tags: TAG: "matrix-conduit:$CI_COMMIT_TAG" +docker build debugging: + extends: .docker-shared-settings + rules: + - if: "$CI_MERGE_REQUEST_TITLE =~ /.*[Dd]ocker.*/" + variables: + TAG: "matrix-conduit-docker-tests:latest" + # --------------------------------------------------------------------- # # Run tests # # --------------------------------------------------------------------- # |