Commit 2cbe7ec2 authored by Geoff Simmons's avatar Geoff Simmons

Update the Docker version in the gitlab CI script.

parent e90cf7ba
...@@ -5,13 +5,16 @@ stages: ...@@ -5,13 +5,16 @@ stages:
- e2e - e2e
- release - release
variable:
DOCKER_VERSION: "24.0.7"
push_to_docker: push_to_docker:
image: docker:20.10.9 image: docker:$DOCKER_VERSION
stage: release stage: release
only: only:
- tags - tags
services: services:
- docker:20.10.9-dind - docker:$DOCKER_VERSION-dind
script: script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:$CI_COMMIT_REF_NAME
...@@ -346,10 +349,10 @@ dev:haproxy-timeouts: ...@@ -346,10 +349,10 @@ dev:haproxy-timeouts:
.integration-tests: .integration-tests:
needs: ["build:controller"] needs: ["build:controller"]
stage: e2e stage: e2e
image: docker:20.10.9 image: docker:$DOCKER_VERSION
retry: 2 retry: 2
services: services:
- docker:20.10.9-dind - docker:$DOCKER_VERSION-dind
variables: variables:
KUBECTL: v1.22.2 KUBECTL: v1.22.2
KIND: v0.11.1 KIND: v0.11.1
...@@ -438,9 +441,9 @@ dev:haproxy-timeouts: ...@@ -438,9 +441,9 @@ dev:haproxy-timeouts:
.build-image: .build-image:
stage: build1 stage: build1
image: docker:20.10.9 image: docker:$DOCKER_VERSION
services: services:
- docker:20.10.9-dind - docker:$DOCKER_VERSION-dind
variables: variables:
IMAGE: BASIC IMAGE: BASIC
before_script: before_script:
......
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