From 674c5749b84a4d05cffdf76157129872e1d0b09d Mon Sep 17 00:00:00 2001 From: Pierre Smeyers <pierre.smeyers@gmail.com> Date: Fri, 8 Dec 2023 14:17:20 +0100 Subject: [PATCH] feat: use centralized service images (gitlab.com) --- README.md | 2 +- kicker.json | 2 +- templates/gitlab-ci-sonar-vault.yml | 2 +- templates/gitlab-ci-sonar.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3249ebe..5881741 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ In order to be able to communicate with the Vault server, the variant requires t | Name | Description | Default value | | ----------------- | -------------------------------------- | ----------------- | -| `TBC_VAULT_IMAGE` | The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use (can be overridden) | `$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master` | +| `TBC_VAULT_IMAGE` | The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use (can be overridden) | `registry.gitlab.com/to-be-continuous/tools/vault-secrets-provider:master` | | `VAULT_BASE_URL` | The Vault server base API url | _none_ | | `VAULT_OIDC_AUD` | The `aud` claim for the JWT | `$CI_SERVER_URL` | | :lock: `VAULT_ROLE_ID` | The [AppRole](https://www.vaultproject.io/docs/auth/approle) RoleID | **must be defined** | diff --git a/kicker.json b/kicker.json index 05778fa..1a9f529 100644 --- a/kicker.json +++ b/kicker.json @@ -62,7 +62,7 @@ { "name": "TBC_VAULT_IMAGE", "description": "The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use", - "default": "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master", + "default": "registry.gitlab.com/to-be-continuous/tools/vault-secrets-provider:master", "advanced": true }, { diff --git a/templates/gitlab-ci-sonar-vault.yml b/templates/gitlab-ci-sonar-vault.yml index 0f1f428..f7dbcc1 100644 --- a/templates/gitlab-ci-sonar-vault.yml +++ b/templates/gitlab-ci-sonar-vault.yml @@ -3,7 +3,7 @@ # ===================================================================================================================== variables: # variabilized vault-secrets-provider image - TBC_VAULT_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" + TBC_VAULT_IMAGE: "registry.gitlab.com/to-be-continuous/tools/vault-secrets-provider:master" # variables have to be explicitly declared in the YAML to be exported to the service VAULT_ROLE_ID: "$VAULT_ROLE_ID" VAULT_SECRET_ID: "$VAULT_SECRET_ID" diff --git a/templates/gitlab-ci-sonar.yml b/templates/gitlab-ci-sonar.yml index 935a0ba..14868f4 100644 --- a/templates/gitlab-ci-sonar.yml +++ b/templates/gitlab-ci-sonar.yml @@ -56,7 +56,7 @@ workflow: variables: # variabilized tracking image - TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" + TBC_TRACKING_IMAGE: "registry.gitlab.com/to-be-continuous/tools/tracking:master" # Sonar SONAR_SCANNER_IMAGE: "registry.hub.docker.com/sonarsource/sonar-scanner-cli:latest" -- GitLab