diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb1499280a7c247b10d1a8adbef1287eeb8513d..25036a3d4d087fd0f86ffc7c33abc239d19a6204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.5.2](https://gitlab.com/to-be-continuous/docker/compare/3.5.1...3.5.2) (2023-01-27) + + +### Bug Fixes + +* "Add registry name in all Docker images" ([b45e6a2](https://gitlab.com/to-be-continuous/docker/commit/b45e6a2b9cd760a7552fee3c2646a6db91871744)) + ## [3.5.1](https://gitlab.com/to-be-continuous/docker/compare/3.5.0...3.5.1) (2023-01-04) diff --git a/README.md b/README.md index e0ff646bf3ba174db704b70b952e0564aecd63f2..a2dd57abdb877cfb47f1b2cd0e08928637ad9140 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: '3.5.1' + ref: '3.5.2' file: '/templates/gitlab-ci-docker.yml' ``` @@ -469,7 +469,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.5.1' + ref: '3.5.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -487,7 +487,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: '3.5.1' + ref: '3.5.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -544,11 +544,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.5.1' + ref: '3.5.2' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.5.1' + ref: '3.5.2' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index f277ffbe6a2ef0cf5e3f0e8cde5b8eb3c558ca1a..efb18fd45a4bcd3caf98a00162e93c01ad63633a 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -11,6 +11,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.5.1"] + command: ["--service", "docker", "3.5.2"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 17433af15e821ef1656869739a315a471679fb64..f29de6856a18ec6e032c86aba4d40cd42fcdd86b 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -412,7 +412,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.5.1"] + command: ["--service", "docker", "3.5.2"] before_script: - *docker-scripts @@ -441,7 +441,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.5.1"] + command: ["--service", "docker", "3.5.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: