diff --git a/CHANGELOG.md b/CHANGELOG.md index a8186a49e0b011559ad1e0c9a2e8eb9d535fd6f8..b492edab312cf523cafb32301a5cd634ff634641 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.5.6](https://gitlab.com/to-be-continuous/docker/compare/5.5.5...5.5.6) (2023-12-2) + + +### Bug Fixes + +* envsubst when variable contains a '&' ([f5781c8](https://gitlab.com/to-be-continuous/docker/commit/f5781c83e2234aba550f8cffafd808602940ff1d)) + ## [5.5.5](https://gitlab.com/to-be-continuous/docker/compare/5.5.4...5.5.5) (2023-11-12) diff --git a/README.md b/README.md index 6cfc84dfdf656b9aa2e2e9d99fa18296143ba7a8..13236a55b4123131e88793b20bef3febc86a9973 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.5' + ref: '5.5.6' file: '/templates/gitlab-ci-docker.yml' ``` @@ -504,7 +504,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.5.5' + ref: '5.5.6' file: '/templates/gitlab-ci-docker.yml' variables: @@ -522,7 +522,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.5' + ref: '5.5.6' file: '/templates/gitlab-ci-docker.yml' variables: @@ -580,11 +580,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.5.5' + ref: '5.5.6' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.5.5' + ref: '5.5.6' 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 a65dad8be1d64775d64ba8191914b948cc86549a..9ec4db701c16da488603c18d7755ea6c3c0dac79 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.5"] + command: ["--service", "docker", "5.5.6"] - 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 e7a210403155f2798ed327c6b2c81b1d2265fe36..6afb171d7b0584c7be7138fda33ec528a3831f95 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.5"] + command: ["--service", "docker", "5.5.6"] - 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 46eeacab35017386d05a00b5f1789fc327c93935..262718fda1a71a9bb016320662abf3976adffb60 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.5"] + command: ["--service", "docker", "5.5.6"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 180a8abbfcfa20e1a1345c62b913412058cccc8a..ba4c85c38463445cce1396d1c332d7707cdec508 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.5"] + command: ["--service", "docker", "5.5.6"] before_script: - *docker-scripts @@ -514,7 +514,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.5"] + command: ["--service", "docker", "5.5.6"] - name: $DOCKER_DIND_IMAGE alias: docker command: