diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f6d788168816ee549c164ee82d9e4e5842d2c92..36e1a302861d7363cc644a94a19fabc945331d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.3.1](https://gitlab.com/to-be-continuous/docker/compare/2.3.0...2.3.1) (2022-02-23) + + +### Bug Fixes + +* **vault:** Vault JWT authentication not working ([4949a87](https://gitlab.com/to-be-continuous/docker/commit/4949a874fb96dedceb0fb16dcd78693d6351dec0)) + # [2.3.0](https://gitlab.com/to-be-continuous/docker/compare/2.2.0...2.3.0) (2022-01-10) diff --git a/README.md b/README.md index 4203276fa1d83919e0a4b5c5de146f17878e5c0c..44c122c8d2cd0c90c5e74c416556c36a27523484 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.0' + ref: '2.3.1' 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.0' + ref: '2.3.1' 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.0' + ref: '2.3.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -404,11 +404,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.3.0' + ref: '2.3.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.3.0' + ref: '2.3.1' 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 0b60db5015c3d6d80975c58117b12d213f31cc20..dc813f50b593eab5681bf4687bd1bf0c923cfc13 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -5,6 +5,6 @@ .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.3.0"] + command: ["--service", "docker", "2.3.1"] - 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 665004b845590e9007ca8c510049b168ea880d70..1aa3b5f7598addcba26a331c44902e73c364fb13 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.0"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.3.1"; 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.0"] + command: ["--service", "docker", "2.3.1"] 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.0"] + command: ["--service", "docker", "2.3.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: