ci: Adjust to current docker
This commit is contained in:
parent
dbd360ebb9
commit
26b8605fa0
1 changed files with 11 additions and 8 deletions
|
@ -16,19 +16,15 @@ variables:
|
||||||
|
|
||||||
.docker-shared-settings:
|
.docker-shared-settings:
|
||||||
stage: "build docker image"
|
stage: "build docker image"
|
||||||
image:
|
|
||||||
name: jdrouet/docker-with-buildx:20.10.21-0.9.1
|
|
||||||
pull_policy: if-not-present
|
|
||||||
needs: []
|
needs: []
|
||||||
tags: [ "docker" ]
|
tags: [ "docker" ]
|
||||||
variables:
|
variables:
|
||||||
# Docker in Docker:
|
# Docker in Docker:
|
||||||
DOCKER_HOST: tcp://docker:2375/
|
DOCKER_BUILDKIT: 1
|
||||||
DOCKER_TLS_CERTDIR: ""
|
image:
|
||||||
# Famedly runners use BTRFS, overlayfs and overlay2 often break jobs
|
name: docker.io/docker
|
||||||
DOCKER_DRIVER: btrfs
|
|
||||||
services:
|
services:
|
||||||
- name: docker:dind
|
- name: docker.io/docker:dind
|
||||||
alias: docker
|
alias: docker
|
||||||
script:
|
script:
|
||||||
- apk add openssh-client
|
- apk add openssh-client
|
||||||
|
@ -104,6 +100,13 @@ docker:tags:
|
||||||
TAG: "matrix-conduit:$CI_COMMIT_TAG"
|
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 #
|
# Run tests #
|
||||||
# --------------------------------------------------------------------- #
|
# --------------------------------------------------------------------- #
|
||||||
|
|
Loading…
Reference in a new issue