From 49cc61c94a3ef70ea7ca581d2af87a2d49632148 Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Sun, 12 Nov 2023 17:36:09 +0100
Subject: [PATCH] fix: ECR and GCP provider image variables
---
templates/gitlab-ci-docker-ecr.yml | 4 ++--
templates/gitlab-ci-docker-gcp.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index b09aa8c..c197c99 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -2,14 +2,14 @@
# === AWS Auth template variant
# =====================================================================================================================
variables:
- TBC_AWS_AUTH_PROVIDER: "$CI_REGISTRY/to-be-continuous/tools/aws-auth-provider:master"
+ TBC_AWS_PROVIDER_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/aws-auth-provider:master"
AWS_OIDC_AUD: "$CI_SERVER_URL"
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "5.5.4"]
- - name: "$TBC_AWS_AUTH_PROVIDER"
+ - name: "$TBC_AWS_PROVIDER_IMAGE"
alias: "aws-auth-provider"
id_tokens:
# required for OIDC auth
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index 28d3528..fec1b57 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -2,14 +2,14 @@
# === GCP Auth template variant
# =====================================================================================================================
variables:
- TBC_GCP_AUTH_PROVIDER: "$CI_REGISTRY/to-be-continuous/tools/gcp-auth-provider:main"
+ TBC_GCP_PROVIDER_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/gcp-auth-provider:main"
GCP_OIDC_AUD: "$CI_SERVER_URL"
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "5.5.4"]
- - name: "$TBC_GCP_AUTH_PROVIDER"
+ - name: "$TBC_GCP_PROVIDER_IMAGE"
alias: "gcp-auth-provider"
variables:
# have to be explicitly declared in the YAML to be exported to the service
--
GitLab