diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f0864ca0f36bf3f5faa04879a771c68f6cf906f..a8186a49e0b011559ad1e0c9a2e8eb9d535fd6f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.5.5](https://gitlab.com/to-be-continuous/docker/compare/5.5.4...5.5.5) (2023-11-12) + + +### Bug Fixes + +* ECR and GCP provider image variables ([49cc61c](https://gitlab.com/to-be-continuous/docker/commit/49cc61c94a3ef70ea7ca581d2af87a2d49632148)) + ## [5.5.4](https://gitlab.com/to-be-continuous/docker/compare/5.5.3...5.5.4) (2023-11-03) diff --git a/README.md b/README.md index 224149d15c6d60bfb36897dfa343bea2dbe45355..4c977ebcb904884bd8083a93728dc464e4365bdd 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.4' + ref: '5.5.5' 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.4' + ref: '5.5.5' 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.4' + ref: '5.5.5' file: '/templates/gitlab-ci-docker.yml' variables: @@ -594,11 +594,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.5.4' + ref: '5.5.5' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.5.4' + ref: '5.5.5' 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 c197c998cd491157158c689737b05870ce7c5019..a65dad8be1d64775d64ba8191914b948cc86549a 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.4"] + command: ["--service", "docker", "5.5.5"] - 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 fec1b5733b0d54b51e7b6041d5070382bf715908..e7a210403155f2798ed327c6b2c81b1d2265fe36 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.4"] + command: ["--service", "docker", "5.5.5"] - 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 af25dd620f9b1dcbb22bface823361c1aaac3d29..46eeacab35017386d05a00b5f1789fc327c93935 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.4"] + command: ["--service", "docker", "5.5.5"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 592738df23502cec613cf4481bcd698cb9ee8db2..c096e3149901c123456bcededd263a411b8ce663 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.4"] + command: ["--service", "docker", "5.5.5"] before_script: - *docker-scripts @@ -514,7 +514,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.4"] + command: ["--service", "docker", "5.5.5"] - name: $DOCKER_DIND_IMAGE alias: docker command: