From 3107e22024e0b2ac4eebd3dcd1ad56885987c398 Mon Sep 17 00:00:00 2001 From: semantic-release-bot <semantic-release-bot@martynus.net> Date: Tue, 19 Oct 2021 08:38:40 +0000 Subject: [PATCH] chore(release): 2.1.2 [skip ci] ## [2.1.2](https://gitlab.com/to-be-continuous/docker/compare/2.1.1...2.1.2) (2021-10-19) ### Bug Fixes * **trivy:** ignore unfixed security issues by default ([f9a1602](https://gitlab.com/to-be-continuous/docker/commit/f9a160201fe11a1ac7d125b5fa9aa181c4599fd5)) --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- templates/gitlab-ci-docker.yml | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e4742d..3306ffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.1.2](https://gitlab.com/to-be-continuous/docker/compare/2.1.1...2.1.2) (2021-10-19) + + +### Bug Fixes + +* **trivy:** ignore unfixed security issues by default ([f9a1602](https://gitlab.com/to-be-continuous/docker/commit/f9a160201fe11a1ac7d125b5fa9aa181c4599fd5)) + ## [2.1.1](https://gitlab.com/to-be-continuous/docker/compare/2.1.0...2.1.1) (2021-10-07) diff --git a/README.md b/README.md index 3502676..b4b6447 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.1.1' + ref: '2.1.2' file: '/templates/gitlab-ci-docker.yml' ``` @@ -308,7 +308,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.1.1' + ref: '2.1.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -326,7 +326,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.1.1' + ref: '2.1.2' file: '/templates/gitlab-ci-docker.yml' variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 52fe8b5..dc9f999 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -368,7 +368,7 @@ stages: fi } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.1.1"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.1.2"; fi init_workspace # ENDSCRIPT @@ -376,7 +376,7 @@ stages: .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.1.1"] + command: ["--service", "docker", "2.1.2"] before_script: - *docker-scripts @@ -405,7 +405,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.1.1"] + command: ["--service", "docker", "2.1.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: -- GitLab