diff --git a/CHANGELOG.md b/CHANGELOG.md index 26fa5d733c6c6ca862dcd22fa82534c39b4b15ca..ec6a98ae7daeb4e736b55104f5c69c8883f9e79b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.7.1](https://gitlab.com/to-be-continuous/docker/compare/5.7.0...5.7.1) (2024-1-18) + + +### Bug Fixes + +* Resolve "Syft packages is now deprecated" ([63a9850](https://gitlab.com/to-be-continuous/docker/commit/63a98503e02103672991de314b30ee987a81b729)) + # [5.7.0](https://gitlab.com/to-be-continuous/docker/compare/5.6.1...5.7.0) (2023-12-8) diff --git a/README.md b/README.md index ad462859f30b733877adcac4b3efb5884ec2e0c0..e883a18954a55fd529c05d32649c630007551bf0 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.7.0' + ref: '5.7.1' file: '/templates/gitlab-ci-docker.yml' ``` @@ -505,7 +505,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.7.0' + ref: '5.7.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -523,7 +523,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.7.0' + ref: '5.7.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -581,11 +581,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.7.0' + ref: '5.7.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.7.0' + ref: '5.7.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 2e931dd5cd23fa81476934e49bc9a9a6f055309b..25df3b401f18f82c87b026123665730a5e55d7e0 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.7.0"] + command: ["--service", "docker", "5.7.1"] - name: "$TBC_AWS_PROVIDER_IMAGE" alias: "aws-auth-provider" id_tokens: diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml index abbd8a6d97fe48c5e3e1a332c87d960c5adc7aa6..4c722f73c86c4df7a917fa2201222b5ddeec0ec6 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.7.0"] + command: ["--service", "docker", "5.7.1"] - name: "$TBC_GCP_PROVIDER_IMAGE" alias: "gcp-auth-provider" variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index 8c79ee6dbe65f1596fbfe3f7fc58ba87d06a978b..79ed9e26c697829a841b63c7a3c927db4c3e850f 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.7.0"] + command: ["--service", "docker", "5.7.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 fb0990f07caa9790578d3c62d2d13d3ddfc47614..e9f76377c5b63496437d8673f3a01adc2bdc821f 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -485,7 +485,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.7.0"] + command: ["--service", "docker", "5.7.1"] before_script: - !reference [.docker-scripts] @@ -518,7 +518,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.7.0"] + command: ["--service", "docker", "5.7.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: