summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2018-11-02 12:24:55 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2018-11-02 13:13:54 +1000
commit83c3a3c6c85216e844a9c7498b6abbd0152ee74a (patch)
treea310d50f23646c84d283680fc85614dce86bbe6a
parent4584a1eadde932e3cf6dc76ea5fffbb174f76508 (diff)
Gitlab CI: use the docker:stable image for image creation
alpine:latest which is now the default image doesn't docker installed by default. apk add docker results in failures Warning: failed to get default registry endpoint from daemon last time all this worked was when we defaulted to the docker:stable image, see https://gitlab.freedesktop.org/libinput/libinput/-/jobs/8316 Let's switch back to that and move on with our lives. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84a12629..53ecf10c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,6 +223,7 @@ freebsd:11.2@docker-check:
#
.fedora@docker-prep: &fedora_docker_prep
stage: docker_prep
+ image: docker:stable
services:
- docker:dind
script:
@@ -266,6 +267,7 @@ fedora:29@docker-prep:
# FIXME: we should clean up the apt cache between each run
.ubuntu@docker-prep: &ubuntu_docker_prep
stage: docker_prep
+ image: docker:stable
services:
- docker:dind
script:
@@ -311,6 +313,7 @@ ubuntu:18.04@docker-prep:
.arch@docker-prep: &arch_docker_prep
stage: docker_prep
+ image: docker:stable
services:
- docker:dind
script:
@@ -342,6 +345,7 @@ arch:rolling@docker-prep:
.freebsd@docker-prep: &freebsd_docker_prep
stage: docker_prep
+ image: docker:stable
services:
- docker:dind
script: