diff --git a/CHANGELOG.md b/CHANGELOG.md index 36e1a302861d7363cc644a94a19fabc945331d85..d8d11a8fd01f2fd6448585eacd96a90a6bb6c9be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.3.2](https://gitlab.com/to-be-continuous/docker/compare/2.3.1...2.3.2) (2022-02-24) + + +### Bug Fixes + +* **vault:** revert Vault JWT authentication not working ([b7ac60a](https://gitlab.com/to-be-continuous/docker/commit/b7ac60a595f6a27b3fc0d24c10465ac923b196d0)) + ## [2.3.1](https://gitlab.com/to-be-continuous/docker/compare/2.3.0...2.3.1) (2022-02-23) diff --git a/README.md b/README.md index 44c122c8d2cd0c90c5e74c416556c36a27523484..23a371da9d775dfe8af1112cca85a34b1eb553cf 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: '2.3.1' + ref: '2.3.2' file: '/templates/gitlab-ci-docker.yml' ``` @@ -330,7 +330,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.3.1' + ref: '2.3.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -348,7 +348,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: '2.3.1' + ref: '2.3.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -404,11 +404,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.3.1' + ref: '2.3.2' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.3.1' + ref: '2.3.2' 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 11cd0c40ea973a1924740332db01d00374587713..1727aa3b11956ec7ab1a5a678844938647cea759 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -9,6 +9,6 @@ variables: .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.3.1"] + command: ["--service", "docker", "2.3.2"] - 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 1aa3b5f7598addcba26a331c44902e73c364fb13..2570657705599bd353fd45549c4fe362d855c260 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -376,7 +376,7 @@ stages: fi } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.3.1"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.3.2"; fi init_workspace # ENDSCRIPT @@ -384,7 +384,7 @@ stages: .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.3.1"] + command: ["--service", "docker", "2.3.2"] before_script: - *docker-scripts @@ -413,7 +413,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.3.1"] + command: ["--service", "docker", "2.3.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: