diff --git a/CHANGELOG.md b/CHANGELOG.md index 25036a3d4d087fd0f86ffc7c33abc239d19a6204..8c189a1613a3890a3eba60d2661ab85aeb806793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.5.3](https://gitlab.com/to-be-continuous/docker/compare/3.5.2...3.5.3) (2023-03-28) + + +### Bug Fixes + +* **sbom:** add CycloneDX report ([76c6727](https://gitlab.com/to-be-continuous/docker/commit/76c6727052690354c03604193a6f1ff53bc34e10)) + ## [3.5.2](https://gitlab.com/to-be-continuous/docker/compare/3.5.1...3.5.2) (2023-01-27) diff --git a/README.md b/README.md index 5558710e4c4e0e7bfaefdcfdf8a9bf4544eeffb0..24d6b05e4b8b97e3d613c73b367124b0356dbfe0 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.5.2' + ref: '3.5.3' file: '/templates/gitlab-ci-docker.yml' ``` @@ -469,7 +469,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.5.2' + ref: '3.5.3' file: '/templates/gitlab-ci-docker.yml' variables: @@ -487,7 +487,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.5.2' + ref: '3.5.3' file: '/templates/gitlab-ci-docker.yml' variables: @@ -544,11 +544,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.5.2' + ref: '3.5.3' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.5.2' + ref: '3.5.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 efb18fd45a4bcd3caf98a00162e93c01ad63633a..103a3fbf69fb0889452558725c83c5c222cec038 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -11,6 +11,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.5.2"] + command: ["--service", "docker", "3.5.3"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 61753697ac5b0647d1d4c7c41159377ff6364dc0..d1b33e0f9f3fec3de33d1e37239744f62aef5c69 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.5.2"] + command: ["--service", "docker", "3.5.3"] before_script: - *docker-scripts @@ -441,7 +441,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.5.2"] + command: ["--service", "docker", "3.5.3"] - name: $DOCKER_DIND_IMAGE alias: docker command: