summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Carpenter <dvn@pep-project.org>2023-01-16 15:18:18 -0500
committerDevan Carpenter <dvn@pep-project.org>2023-01-16 15:18:18 -0500
commitc2c565b082c1b7f5dc7321b118a5c131b5891cf5 (patch)
treed10c70888691a0f95d2479a5dbe886068e005a61
parent6a79e775e9e7ae466bfc4572c2ba0e9a095171e9 (diff)
Revert "CI: use kvm runner for docker build-push job"
-rw-r--r--.gitlab-ci.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74213498..10593f13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -360,9 +360,14 @@ windows-msvc32-cng:
CFLAGS: "" # Silence some C warnings when compiling with MSVC
docker-build-push:
+ # Official docker image.
+ image: docker:stable
stage: build
+ services:
+ - docker:dind
tags:
- - kvm
+ - docker
+ - self-hosted
before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
script:
@@ -385,6 +390,8 @@ docker-build-push:
variables:
CI_REGISTRY: "registry.gitlab.com"
IMAGE: "$CI_REGISTRY/sequoia-pgp/sequoia"
+ DOCKER_HOST: tcp://docker:2376
+ DOCKER_DRIVER: overlay2
variables:
DEBIAN_FRONTEND: noninteractive