diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be12c1e15f1f836ba4934541dce5f8a181eff77..4979d9b13632108d9322c2feca329d178cd19ec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.3.1](https://gitlab.com/to-be-continuous/docker/compare/5.3.0...5.3.1) (2023-09-19) + + +### Bug Fixes + +* **dind:** wait for Docker daemon to be ready with a timeout (1 min) ([ea965f6](https://gitlab.com/to-be-continuous/docker/commit/ea965f6e179cade7768415432593fa8a24c68162)) + # [5.3.0](https://gitlab.com/to-be-continuous/docker/compare/5.2.2...5.3.0) (2023-08-28) diff --git a/README.md b/README.md index cfefb3da19fbae3d9c72bced7b5c148a87e55a9f..55dfd2a43fb84475b32df1e77b75abdc26405145 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.3.0' + ref: '5.3.1' file: '/templates/gitlab-ci-docker.yml' ``` @@ -475,7 +475,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.3.0' + ref: '5.3.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -493,7 +493,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.3.0' + ref: '5.3.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -551,11 +551,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.3.0' + ref: '5.3.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.3.0' + ref: '5.3.1' 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 9376dfefa39215dd75efdb452f000b6a6a587252..df48aefdba45712a27b0519ae87b539e81cbdc3f 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.3.0"] + command: ["--service", "docker", "5.3.1"] - name: "$TBC_GCP_AUTH_PROVIDER" alias: "gcp-auth-provider" variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index b5bfb21104478c3cd60aeecc50ba43665b5a96c4..d29f3af966139a6f4184f708595a60d1063455b1 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.3.0"] + command: ["--service", "docker", "5.3.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 ea778a4d96d21c5afcba8cd2d774d60d2ba45bf7..099e7e1cfb7ad14c669aa7a3196dd622d05cf4be 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -450,7 +450,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.3.0"] + command: ["--service", "docker", "5.3.1"] before_script: - *docker-scripts @@ -483,7 +483,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.3.0"] + command: ["--service", "docker", "5.3.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: