From da8e6ddaf46a563c5f451ba27c5722ca04d91828 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Sun, 7 Apr 2024 17:08:29 +0800 Subject: [PATCH] chore: unify docker and dind images --- .gitlab/workflows/devcontainer.yml | 2 +- .gitlab/workflows/release.yml | 2 +- .../workflows/devcontainer.yml.jinja | 2 +- .../workflows/release.yml.jinja | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/workflows/devcontainer.yml b/.gitlab/workflows/devcontainer.yml index 35db6766..aabaf0e5 100644 --- a/.gitlab/workflows/devcontainer.yml +++ b/.gitlab/workflows/devcontainer.yml @@ -31,7 +31,7 @@ dev-container-publish: --tag ${CI_REGISTRY_IMAGE}/dev:py${PYTHON_VERSION} \ --target dev services: - - docker:26.0.0-dind@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 + - docker:26.0.0@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 stage: build variables: DOCKER_TLS_CERTDIR: /certs diff --git a/.gitlab/workflows/release.yml b/.gitlab/workflows/release.yml index abadc429..7c59652a 100644 --- a/.gitlab/workflows/release.yml +++ b/.gitlab/workflows/release.yml @@ -67,7 +67,7 @@ container-publish: --tag ${CI_REGISTRY_IMAGE}:py${PYTHON_VERSION}-${CI_COMMIT_TAG} \ --target prod services: - - docker:26.0.0-dind@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 + - docker:26.0.0@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 stage: release variables: DOCKER_TLS_CERTDIR: /certs diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja index 2396afdc..0489218c 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/devcontainer.yml.jinja @@ -42,7 +42,7 @@ dev-container-publish: --tag ${CI_REGISTRY_IMAGE}/dev:py${PYTHON_VERSION} \ --target dev services: - - docker:26.0.0-dind@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 + - docker:26.0.0@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 stage: build variables: DOCKER_TLS_CERTDIR: /certs diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja index fc825d92..d39be1c8 100644 --- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja +++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/release.yml.jinja @@ -78,7 +78,7 @@ container-publish: --tag ${CI_REGISTRY_IMAGE}:py${PYTHON_VERSION}-${CI_COMMIT_TAG} \ --target prod services: - - docker:26.0.0-dind@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 + - docker:26.0.0@sha256:016c45d9e31461802186e8e9aaa394f35e173a8ce913ea7195a672cdc97102f2 stage: release variables: DOCKER_TLS_CERTDIR: /certs