diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ee603ffe133d69b47472c2764fcda5a9dd4d0e..1759122f241125c97d2856f2ccda314c17474ed0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.2.2](https://gitlab.com/to-be-continuous/docker/compare/5.2.1...5.2.2) (2023-07-25) + + +### Bug Fixes + +* **kaniko:** Allow repositories with port numbers to be used for caching ([d17e215](https://gitlab.com/to-be-continuous/docker/commit/d17e215c424fae9b9befc23922f93e23ef273191)) + ## [5.2.1](https://gitlab.com/to-be-continuous/docker/compare/5.2.0...5.2.1) (2023-07-12) diff --git a/README.md b/README.md index 76a81039838cbba6518258c60834d53f2e39f6e5..dbf0e7795e727df2ad5bb09adac5cdb3ba724ce5 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.2.1' + ref: '5.2.2' file: '/templates/gitlab-ci-docker.yml' ``` @@ -473,7 +473,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.2.1' + ref: '5.2.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -491,7 +491,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.2.1' + ref: '5.2.2' file: '/templates/gitlab-ci-docker.yml' variables: @@ -548,11 +548,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.2.1' + ref: '5.2.2' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.2.1' + ref: '5.2.2' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml index 51354f51dd3fe4028499262543d092fdf2a97abd..277d9a8fc00d96193aca7c42a329fbfbb54f2064 100644 --- a/templates/gitlab-ci-docker-gcp.yml +++ b/templates/gitlab-ci-docker-gcp.yml @@ -11,6 +11,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.2.1"] + command: ["--service", "docker", "5.2.2"] - name: "$TBC_GCP_AUTH_PROVIDER" alias: "gcp-auth-provider" diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index 46599075fdfa06e6a72653fe2a22e4b60f6439a8..051ea8357d162164a6ae1f2765338490a802b7c4 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", "5.2.1"] + command: ["--service", "docker", "5.2.2"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 10e89648bbdbce22677821e7ac7be4613e8ccc89..36a1cf7d98c46c13dbb9580db1ae94d2be68833c 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -447,7 +447,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.2.1"] + command: ["--service", "docker", "5.2.2"] before_script: - *docker-scripts @@ -476,7 +476,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.2.1"] + command: ["--service", "docker", "5.2.2"] - name: $DOCKER_DIND_IMAGE alias: docker command: