diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b16d3f63d713ada59f40a42bd87c85b99b9a50d..ecbe87ba4f7ae0d38a33769368b6c980f0f3617c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.1.0](https://gitlab.com/to-be-continuous/docker/compare/3.0.0...3.1.0) (2022-09-20) + + +### Features + +* add custom DOCKER_CONFIG_FILE var ([3201240](https://gitlab.com/to-be-continuous/docker/commit/3201240e9437d7602779fb33252e8dce7e028257)) + # [3.0.0](https://gitlab.com/to-be-continuous/docker/compare/2.7.1...3.0.0) (2022-08-05) diff --git a/README.md b/README.md index 8065ef6be7f1df08753e060d62c5f1ec35c0938d..77cc0aeff1db152b1c60023388b8ce731ff78d9e 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.0.0' + ref: '3.1.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -423,7 +423,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.0.0' + ref: '3.1.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -441,7 +441,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.0.0' + ref: '3.1.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -497,11 +497,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.0.0' + ref: '3.1.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.0.0' + ref: '3.1.0' 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 6234c7b469f0de3c7e90b1a30b0dd35ddbac8595..3799fa08c3e78dbd5c990b8eb872947abfafab83 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.0.0"] + command: ["--service", "docker", "3.1.0"] - 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 3e3bdc30a9b174dae6d285fe61925b3b5aa73c9d..c09f1a59217adff6177ee87851bdb867776eec2c 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.0.0"] + command: ["--service", "docker", "3.1.0"] before_script: - *docker-scripts @@ -437,7 +437,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.0.0"] + command: ["--service", "docker", "3.1.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: