Commit 49cc61c9 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: ECR and GCP provider image variables

parent 0b1cd917

templates/gitlab-ci-docker-ecr.yml

+2 −2
Original line number Diff line number Diff line
@@ -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

templates/gitlab-ci-docker-gcp.yml

+2 −2
Original line number Diff line number Diff line
@@ -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