From 5d868c995da18f865e2ad852ff8ea27cf404ce84 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 23 Jul 2019 09:55:29 +0200 Subject: Fix issue with gitlab and Docker 19 (use docker 18) See https://gitlab.com/gitlab-org/gitlab-runner/issues/4499 Signed-off-by: Laurent Bonnans --- scripts/ci/gitlab/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ci/gitlab/docker.yml b/scripts/ci/gitlab/docker.yml index 827bb47..5b81d77 100644 --- a/scripts/ci/gitlab/docker.yml +++ b/scripts/ci/gitlab/docker.yml @@ -6,10 +6,10 @@ # - BITBAKE_CHECKOUT_IMAGE # - BITBKAE_IMAGE_MASTER # - BITBAKE_CHECKOUT_IMAGE_MASTER - image: docker:stable + image: docker:18 stage: docker services: - - docker:dind + - docker:18-dind before_script: - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" script: @@ -26,10 +26,10 @@ # parameters: # - BITBAKE_IMAGE # - BITBAKE_CHECKOUT_IMAGE - image: docker:stable + image: docker:18 stage: docker services: - - docker:dind + - docker:18-dind before_script: - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" script: -- cgit v1.2.3-54-g00ecf