diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e4742d3ec62a16c84fa26846735d554e6eb5d5c..3306ffb0266e3dafe2c4c942947ff929ff01b134 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 350267696f1cad433d08e993ef7281d0136e2c0e..b4b6447ab292e462dda25ecb45e7a8f9b625c513 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 52fe8b539c89593d0a7c72a3cfba34d84dd39d78..dc9f9990122b88d1b32469e68785ef5affcd0d33 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: