diff --git a/CHANGELOG.md b/CHANGELOG.md index 49aff34e857f7650392da2bb3d6529894c19a818..f2246eb3ab0430308b5c83c93c687202104d1a56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.2.1](https://gitlab.com/to-be-continuous/docker/compare/3.2.0...3.2.1) (2022-10-04) + + +### Bug Fixes + +* **hadolint:** fix shell syntax error ([88de431](https://gitlab.com/to-be-continuous/docker/commit/88de43147892124c85ef6f62a381c8ead7e2929b)) + # [3.2.0](https://gitlab.com/to-be-continuous/docker/compare/3.1.1...3.2.0) (2022-10-04) diff --git a/README.md b/README.md index c5170f7304417153baff6c328a4cd305176784df..7a9896c4f418e57fe582a21c06c11b354f00a8a4 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.2.0' + ref: '3.2.1' file: '/templates/gitlab-ci-docker.yml' ``` @@ -437,7 +437,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.2.0' + ref: '3.2.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -455,7 +455,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.2.0' + ref: '3.2.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -511,11 +511,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.2.0' + ref: '3.2.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.2.0' + ref: '3.2.1' 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 f6734ec71ec5cb30c45f7d397847e65fd2839427..5e6f313d6686881a45bb8b6e70aa7496b45bb510 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -9,6 +9,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.0"] + command: ["--service", "docker", "3.2.1"] - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index c72dd5fabac2b9663b44d4d6e61e07d6dbc2fd5c..a44dd48864ff66f1f03d4b9b9b5e226d37dc5058 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -408,7 +408,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.0"] + command: ["--service", "docker", "3.2.1"] before_script: - *docker-scripts @@ -437,7 +437,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.2.0"] + command: ["--service", "docker", "3.2.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: