diff --git a/CHANGELOG.md b/CHANGELOG.md index ec627fb148b5175c94b23fbff0e4c1ee286bbe7c..1f6d788168816ee549c164ee82d9e4e5842d2c92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.3.0](https://gitlab.com/to-be-continuous/docker/compare/2.2.0...2.3.0) (2022-01-10) + + +### Features + +* Vault variant + non-blocking warning in case failed decoding [@url](https://gitlab.com/url)@ variable ([f1bbac3](https://gitlab.com/to-be-continuous/docker/commit/f1bbac38b305f8bdda946d8372338c5293da7f59)) + # [2.2.0](https://gitlab.com/to-be-continuous/docker/compare/2.1.2...2.2.0) (2021-11-24) diff --git a/README.md b/README.md index 34185868c3ab737a22d644d454beb482b9cc92dd..508778a7fec9ae6e730c04c525c8613291bee576 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.2.0' + ref: '2.3.0' 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.2.0' + ref: '2.3.0' 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.2.0' + ref: '2.3.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -404,11 +404,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.2.0' + ref: '2.3.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.2.0' + ref: '2.3.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 f7e9b90645ebfa7db662ceb63253d0f21093daef..5fda33c04803b4122a0ecc95779752b211b23f96 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.2.0"] + command: ["--service", "docker", "2.3.0"] - 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 fd2af3e5edbfb40421127ed27487561897d8f08a..665004b845590e9007ca8c510049b168ea880d70 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.2.0"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.3.0"; 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.2.0"] + command: ["--service", "docker", "2.3.0"] 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.2.0"] + command: ["--service", "docker", "2.3.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: