From 2c8cca2fa3042a2b3dab7ce5cb3c833e6e81a086 Mon Sep 17 00:00:00 2001 From: semantic-release-bot <semantic-release-bot@martynus.net> Date: Tue, 12 Apr 2022 11:55:56 +0000 Subject: [PATCH] chore(release): 2.3.3 [skip ci] ## [2.3.3](https://gitlab.com/to-be-continuous/docker/compare/2.3.2...2.3.3) (2022-04-12) ### Bug Fixes * **Trivy:** restore default Git strategy to allow .trivyignore ([b2fc514](https://gitlab.com/to-be-continuous/docker/commit/b2fc51491d875d65a4998dfa47f124ba11a50615)) --- CHANGELOG.md | 7 +++++++ README.md | 10 +++++----- templates/gitlab-ci-docker-vault.yml | 2 +- templates/gitlab-ci-docker.yml | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8d11a8..41fa55d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.3.3](https://gitlab.com/to-be-continuous/docker/compare/2.3.2...2.3.3) (2022-04-12) + + +### Bug Fixes + +* **Trivy:** restore default Git strategy to allow .trivyignore ([b2fc514](https://gitlab.com/to-be-continuous/docker/commit/b2fc51491d875d65a4998dfa47f124ba11a50615)) + ## [2.3.2](https://gitlab.com/to-be-continuous/docker/compare/2.3.1...2.3.2) (2022-02-24) diff --git a/README.md b/README.md index 23a371d..7740eeb 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.2' + ref: '2.3.3' 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.2' + ref: '2.3.3' 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.2' + ref: '2.3.3' file: '/templates/gitlab-ci-docker.yml' variables: @@ -404,11 +404,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.3.2' + ref: '2.3.3' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.3.2' + ref: '2.3.3' 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 1727aa3..2981b4a 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.2"] + command: ["--service", "docker", "2.3.3"] - 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 04ed8e8..1b55cbb 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.2"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.3.3"; 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.2"] + command: ["--service", "docker", "2.3.3"] 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.2"] + command: ["--service", "docker", "2.3.3"] - name: $DOCKER_DIND_IMAGE alias: docker command: -- GitLab