diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eaa1a7a18a57b428b6814b1e9a56e48b277a3fc..7c673fbb951e91f1069d88d832e887c961919d69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.5.0](https://gitlab.com/to-be-continuous/docker/compare/3.4.0...3.5.0) (2022-12-13) + + +### Features + +* **vault:** configurable Vault Secrets Provider images ([96e2c5d](https://gitlab.com/to-be-continuous/docker/commit/96e2c5df04f633b86ac9463782c37a7dd4e3a549)) + # [3.4.0](https://gitlab.com/to-be-continuous/docker/compare/3.3.0...3.4.0) (2022-12-12) diff --git a/README.md b/README.md index ca215d94f080a0c97461253c884df4e90d767411..72d99d1e014269f45fc2fb8081cd4930a2107006 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `.g ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.4.0' + ref: '3.5.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -469,7 +469,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.4.0' + ref: '3.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -487,7 +487,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.4.0' + ref: '3.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -544,11 +544,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.4.0' + ref: '3.5.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.4.0' + ref: '3.5.0' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index 753ad78fa882b763b77e662412ac8deea3b1491e..e2c7b971e1a9c680eefa65dfd21404897584ad2f 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -11,6 +11,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.4.0"] + command: ["--service", "docker", "3.5.0"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 0db57c2f1b9fa4cf3ae98bcc7c8802be4113c95f..619e6da579c6397959e3e4de5a6c38e99f840780 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -412,7 +412,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.4.0"] + command: ["--service", "docker", "3.5.0"] before_script: - *docker-scripts @@ -441,7 +441,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.4.0"] + command: ["--service", "docker", "3.5.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: