diff --git a/CHANGELOG.md b/CHANGELOG.md index 2871d9dd5ab338294b54d704e1abecc077e137b2..286d8b48e47e0f65016aee5eccd17c3c0696967f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.3.0](https://gitlab.com/to-be-continuous/docker/compare/3.2.2...3.3.0) (2022-11-29) + + +### Features + +* add a job generating software bill of materials ([ea8ca4e](https://gitlab.com/to-be-continuous/docker/commit/ea8ca4e7c5904e34dda2ee6fb6b33788f4b4544a)) + ## [3.2.2](https://gitlab.com/to-be-continuous/docker/compare/3.2.1...3.2.2) (2022-10-06) diff --git a/README.md b/README.md index 3e229f18514e30e5b9180bbc02a760ca989aceb9..d4d5cde0b3298e4e5acb2dd69df77c22b0cab90a 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.2' + ref: '3.3.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -449,7 +449,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.2.2' + ref: '3.3.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -467,7 +467,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.2' + ref: '3.3.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -523,11 +523,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.2.2' + ref: '3.3.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.2.2' + ref: '3.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 93611438039de309bfbf78aaec82831d4897d5ff..267c928227f124d0a536199fcc4398880de624c9 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.2"] + command: ["--service", "docker", "3.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 745c73d96b797661455b08aa951f0df38d1baf10..f42d800062814a43c02f7e371cc3ebceda28f73d 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -412,7 +412,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.2"] + command: ["--service", "docker", "3.3.0"] before_script: - *docker-scripts @@ -441,7 +441,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.2"] + command: ["--service", "docker", "3.3.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: