diff --git a/CHANGELOG.md b/CHANGELOG.md index ee9a2a6af2e35a96bdd2dc2b9de802ccc57de51a..1f386953de2b1e5e69cbb0ab67b9619429647182 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [5.5.3](https://gitlab.com/to-be-continuous/docker/compare/5.5.2...5.5.3) (2023-10-18) + + +### Bug Fixes + +* **hadolint:** Hadolint report file name derives from Dockerfile's path (MD5) instead of content ([e7bbdcc](https://gitlab.com/to-be-continuous/docker/commit/e7bbdcc91f6fc1383d1b3e6fcdf536e2a6edb536)) +* **sbom:** sbom report's name derives from snapshot image (same as Trivy) ([62341f4](https://gitlab.com/to-be-continuous/docker/commit/62341f44b76e7ac933dd518c880479c5ff3300cf)) + ## [5.5.2](https://gitlab.com/to-be-continuous/docker/compare/5.5.1...5.5.2) (2023-10-16) diff --git a/README.md b/README.md index ad3c1bb4baaa9f9466a006b57653357efc3846f4..157fb5e82d1aa877797cce974ab9dbe213f6ece4 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: '5.5.2' + ref: '5.5.3' file: '/templates/gitlab-ci-docker.yml' ``` @@ -518,7 +518,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.5.2' + ref: '5.5.3' file: '/templates/gitlab-ci-docker.yml' variables: @@ -536,7 +536,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: '5.5.2' + ref: '5.5.3' file: '/templates/gitlab-ci-docker.yml' variables: @@ -594,11 +594,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.5.2' + ref: '5.5.3' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.5.2' + ref: '5.5.3' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml index 9d1dd6757d7c6c89e173927582304401c2202f98..586d88c3db82555b831c647d6127779c69db1e8f 100644 --- a/templates/gitlab-ci-docker-ecr.yml +++ b/templates/gitlab-ci-docker-ecr.yml @@ -8,7 +8,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.2"] + command: ["--service", "docker", "5.5.3"] - name: "$TBC_AWS_AUTH_PROVIDER" alias: "aws-auth-provider" id_tokens: diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml index 0718a92777925d9618d1f6e310e42a137039cc73..d14056d374495c903407d21845d3f11ff109f0fa 100644 --- a/templates/gitlab-ci-docker-gcp.yml +++ b/templates/gitlab-ci-docker-gcp.yml @@ -8,7 +8,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.2"] + command: ["--service", "docker", "5.5.3"] - name: "$TBC_GCP_AUTH_PROVIDER" alias: "gcp-auth-provider" variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index f5718606179acad8078318fc9f8f8523914206e8..6f90745de5c9e9d33de33e36291f434cfbdd7bb5 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -12,7 +12,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.2"] + command: ["--service", "docker", "5.5.3"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 9afee36fec152635d7ee0f181b23b481c73c5758..07266a52381160e5f3fb95b76d8368bdad7adf90 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -481,7 +481,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.2"] + command: ["--service", "docker", "5.5.3"] before_script: - *docker-scripts @@ -514,7 +514,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.2"] + command: ["--service", "docker", "5.5.3"] - name: $DOCKER_DIND_IMAGE alias: docker command: