diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-23 09:55:29 +0200 |
|---|---|---|
| committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-23 09:55:29 +0200 |
| commit | 5d868c995da18f865e2ad852ff8ea27cf404ce84 (patch) | |
| tree | 12bc5cfe111faa10f647706e07914ac061ef82e7 /scripts/ci/gitlab | |
| parent | 71fbe1fd89e2869dbcad20f1b1c4fbaba4338f15 (diff) | |
| download | meta-updater-5d868c995da18f865e2ad852ff8ea27cf404ce84.tar.gz | |
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 <laurent.bonnans@here.com>
Diffstat (limited to 'scripts/ci/gitlab')
| -rw-r--r-- | scripts/ci/gitlab/docker.yml | 8 |
1 files 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 @@ | |||
| 6 | # - BITBAKE_CHECKOUT_IMAGE | 6 | # - BITBAKE_CHECKOUT_IMAGE |
| 7 | # - BITBKAE_IMAGE_MASTER | 7 | # - BITBKAE_IMAGE_MASTER |
| 8 | # - BITBAKE_CHECKOUT_IMAGE_MASTER | 8 | # - BITBAKE_CHECKOUT_IMAGE_MASTER |
| 9 | image: docker:stable | 9 | image: docker:18 |
| 10 | stage: docker | 10 | stage: docker |
| 11 | services: | 11 | services: |
| 12 | - docker:dind | 12 | - docker:18-dind |
| 13 | before_script: | 13 | before_script: |
| 14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | 14 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" |
| 15 | script: | 15 | script: |
| @@ -26,10 +26,10 @@ | |||
| 26 | # parameters: | 26 | # parameters: |
| 27 | # - BITBAKE_IMAGE | 27 | # - BITBAKE_IMAGE |
| 28 | # - BITBAKE_CHECKOUT_IMAGE | 28 | # - BITBAKE_CHECKOUT_IMAGE |
| 29 | image: docker:stable | 29 | image: docker:18 |
| 30 | stage: docker | 30 | stage: docker |
| 31 | services: | 31 | services: |
| 32 | - docker:dind | 32 | - docker:18-dind |
| 33 | before_script: | 33 | before_script: |
| 34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" | 34 | - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY" |
| 35 | script: | 35 | script: |