diff --git a/CHANGELOG.md b/CHANGELOG.md index d97dd3d49771020148581062bd0c399553b8479b..ab97465a8c8af0458e333246eed2d14023570126 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.5.1](https://gitlab.com/to-be-continuous/docker/compare/5.5.0...5.5.1) (2023-10-06) + + +### Bug Fixes + +* **trivy:** fail when scanning an image that has reached EOL ([b89f06e](https://gitlab.com/to-be-continuous/docker/commit/b89f06e5c5786461ce225e13d07b33b0d3f1cd4d)) + # [5.5.0](https://gitlab.com/to-be-continuous/docker/compare/5.4.1...5.5.0) (2023-09-30) diff --git a/README.md b/README.md index 422a4eaa7194dbfa2c7bc16a3106c6cc365b1075..2a0f614190b39060ab16c8b9838693f5ba9e18c5 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.0' + ref: '5.5.1' 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.0' + ref: '5.5.1' 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.0' + ref: '5.5.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -594,11 +594,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.5.0' + ref: '5.5.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.5.0' + ref: '5.5.1' 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 8c50985802f8a37018ff57fb1a17db73cc7c8973..fe81a79d4cd523dc97f7cfec87831981b5fcd398 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.0"] + command: ["--service", "docker", "5.5.1"] - 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 596cf7b979f5cb201c5945bfdcc38839f37d2fc0..1ec47e4bea63eecc4b2cc6872f03e549e01dfeb7 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.0"] + command: ["--service", "docker", "5.5.1"] - 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 611b8ca84b29469c169be733385cbe8ac6bc5d7b..51712ce037fe04a036d9a2ee34f6d1d948eab055 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.0"] + command: ["--service", "docker", "5.5.1"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 02914912a731253bb41958627745ec7c072389e6..d9f4d1307eea53caf2e637c3b6e324795c52fa3e 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -475,7 +475,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.0"] + command: ["--service", "docker", "5.5.1"] before_script: - *docker-scripts @@ -508,7 +508,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.0"] + command: ["--service", "docker", "5.5.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: