From b91e936e028c8002edd8f79beb20d7451c87ead4 Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Sun, 1 May 2022 13:39:47 +0200
Subject: [PATCH] feat: configurable tracking image
---
templates/gitlab-ci-docker-vault.yml | 2 +-
templates/gitlab-ci-docker.yml | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index 2ff2349..909376b 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -8,7 +8,7 @@ variables:
.docker-base:
services:
- - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
+ - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "2.4.0"]
- name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
alias: "vault-secrets-provider"
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index fa8c2fc..e7115ea 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -14,6 +14,9 @@
# Floor, Boston, MA 02110-1301, USA.
# =========================================================================================
variables:
+ # variabilized tracking image
+ TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
+
DOCKER_LINT_IMAGE: "projectatomic/dockerfile-lint:latest"
DOCKER_HADOLINT_IMAGE: "hadolint/hadolint:latest-alpine"
DOCKER_IMAGE: "docker:latest"
@@ -363,7 +366,7 @@ stages:
.docker-base:
services:
- - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
+ - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "2.4.0"]
before_script:
- *docker-scripts
@@ -392,7 +395,7 @@ stages:
_CUSTOM_CA_CERTS: "${CUSTOM_CA_CERTS}"
_TRACE: "${TRACE}"
services:
- - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
+ - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "2.4.0"]
- name: $DOCKER_DIND_IMAGE
alias: docker
--
GitLab