diff --git a/CHANGELOG.md b/CHANGELOG.md index d62be0186375dac8105dc7809e26878b7636a956..ff320efb73ca3611a85927d5128e280a7ed96418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.10.2](https://gitlab.com/to-be-continuous/docker/compare/5.10.1...5.10.2) (2024-05-05) + + +### Bug Fixes + +* **workflow:** disable MR pipeline from prod & integ branches ([6460d7b](https://gitlab.com/to-be-continuous/docker/commit/6460d7bba7a231ff68b163c861a4b40f37ee08bb)) + ## [5.10.1](https://gitlab.com/to-be-continuous/docker/compare/5.10.0...5.10.1) (2024-04-03) diff --git a/README.md b/README.md index 1c38f69680ba572b615c20406945f02856def831..4d6ca3c2fbead1f63c57c0e6306b7851c5cbed9a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Add the following to your `gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.10.1 + - component: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.10.2 # 2: set/override component inputs inputs: build-tool: buildah # ⚠ this is only an example @@ -28,7 +28,7 @@ Add the following to your `gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/docker' - ref: '5.10.1' + ref: '5.10.2' file: '/templates/gitlab-ci-docker.yml' variables: diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml index 0c40d3b09a0a8251c5f9a21cebe1589144a1494a..2cd4f0c421b152b0047d5b35ed89dffa1cf7b9e8 100644 --- a/templates/gitlab-ci-docker-ecr.yml +++ b/templates/gitlab-ci-docker-ecr.yml @@ -45,7 +45,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.10.1"] + command: ["--service", "docker", "5.10.2"] - 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 d6637d4657d00ec3a7edd68ea56312f5f06bbcdb..fec70c05e0a57c90b0ddef1d6ed14c056ed5d7ff 100644 --- a/templates/gitlab-ci-docker-gcp.yml +++ b/templates/gitlab-ci-docker-gcp.yml @@ -44,7 +44,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.10.1"] + command: ["--service", "docker", "5.10.2"] - 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 f2f8753ad92aa64bae646cfdea602949932980da..c82a522070a14db809e21676250bc21bafb008bd 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -22,7 +22,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.10.1"] + command: ["--service", "docker", "5.10.2"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index e21f98f63eb6e84036074b24d0d58b808569df3e..8cd64d2498bd9a31faa812ab187848382b0877c4 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -664,7 +664,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.10.1"] + command: ["--service", "docker", "5.10.2"] before_script: - !reference [.docker-scripts] @@ -697,7 +697,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.10.1"] + command: ["--service", "docker", "5.10.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: