diff --git a/CHANGELOG.md b/CHANGELOG.md index f2246eb3ab0430308b5c83c93c687202104d1a56..2871d9dd5ab338294b54d704e1abecc077e137b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.2.2](https://gitlab.com/to-be-continuous/docker/compare/3.2.1...3.2.2) (2022-10-06) + + +### Bug Fixes + +* Error when generating Trivy report ([2b5ec6e](https://gitlab.com/to-be-continuous/docker/commit/2b5ec6e5fe570b14d0747eb6b65f0f086f1ca75f)) + ## [3.2.1](https://gitlab.com/to-be-continuous/docker/compare/3.2.0...3.2.1) (2022-10-04) diff --git a/README.md b/README.md index 7a9896c4f418e57fe582a21c06c11b354f00a8a4..e92be665a6eebc707ae7415e847c7fb614ef2986 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: '3.2.1' + ref: '3.2.2' file: '/templates/gitlab-ci-docker.yml' ``` @@ -437,7 +437,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.2.1' + ref: '3.2.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -455,7 +455,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: '3.2.1' + ref: '3.2.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -511,11 +511,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.2.1' + ref: '3.2.2' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.2.1' + ref: '3.2.2' 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 5e6f313d6686881a45bb8b6e70aa7496b45bb510..93611438039de309bfbf78aaec82831d4897d5ff 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -9,6 +9,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.1"] + command: ["--service", "docker", "3.2.2"] - 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 8b8d10e2d3f0292cafe892e5d43d8fee44e14d7b..e7525a9361f7cc3887c04e82e62d0e983d81baca 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -408,7 +408,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.1"] + command: ["--service", "docker", "3.2.2"] before_script: - *docker-scripts @@ -437,7 +437,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.1"] + command: ["--service", "docker", "3.2.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: