Commit ac8b8d20 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason 🔴
Browse files

Merge branch '163-docker-20.10.5' into 'master'

Update Docker to 20.10 in our pipelines on CI/CD

Closes #163

See merge request !191
parents 3aeb17e0 cc0d9300
Pipeline #284148626 passed with stages
in 4 minutes and 49 seconds
......@@ -2,9 +2,9 @@ build:
extends:
- .rules:except-docs
stage: build
image: docker:19.03.5
image: docker:20.10.5
services:
- docker:19.03.5-dind
- docker:20.10.5-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
script:
......
......@@ -10,9 +10,9 @@
release-tag:
stage: release
image: docker:19.03.5
image: docker:20.10.5
services:
- docker:19.03.5-dind
- docker:20.10.5-dind
script:
- 'echo ${CI_JOB_TOKEN} | docker login --password-stdin -u $CI_REGISTRY_USER $CI_REGISTRY'
- export ci_image="${CI_REGISTRY_IMAGE}"
......
......@@ -422,9 +422,9 @@ test-chart-major-version-upgrade:
test-upgrade-from-helm2-fails:
extends:
- .rules:except-docs
image: docker:19.03.12
image: docker:20.10.5
services:
- docker:19.03.12-dind
- docker:20.10.5-dind
- name: registry.gitlab.com/gitlab-org/cluster-integration/test-utils/k3s-gitlab-ci/releases/v1.16.7-k3s1
alias: k3s
interruptible: true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment