diff --git a/CHANGELOG.md b/CHANGELOG.md index d3dd5f24497c46f238478190dfb80714c17c5444..a212a4f419aff8371cf02d72d00ec1aa8c675cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.5.0](https://gitlab.com/to-be-continuous/docker/compare/2.4.0...2.5.0) (2022-05-01) + + +### Features + +* configurable tracking image ([b91e936](https://gitlab.com/to-be-continuous/docker/commit/b91e936e028c8002edd8f79beb20d7451c87ead4)) + # [2.4.0](https://gitlab.com/to-be-continuous/docker/compare/2.3.3...2.4.0) (2022-04-27) diff --git a/README.md b/README.md index 8bf4c809bc9e846e9df46c65095cbd6c505746e9..6468531e65ca83f4be1f05eadfcf13e8c29db8e9 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: '2.4.0' + ref: '2.5.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -342,7 +342,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.4.0' + ref: '2.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -360,7 +360,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: '2.4.0' + ref: '2.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -416,11 +416,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.4.0' + ref: '2.5.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.4.0' + ref: '2.5.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 909376b43b973dd13ae588076ed7459da07ebe2d..82cea879306112e29b4718e5f855da76980a106d 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", "2.4.0"] + command: ["--service", "docker", "2.5.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 82c865dcdebb341636eb8f778d2fa3b46ee7facb..ec79eac027868ffb289fc75dece55663d5a8bdce 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -375,7 +375,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.4.0"] + command: ["--service", "docker", "2.5.0"] before_script: - *docker-scripts @@ -404,7 +404,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.4.0"] + command: ["--service", "docker", "2.5.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: