From b5c6958e3c1e941e9dafa7c1bfbb8ce22e9e37a0 Mon Sep 17 00:00:00 2001 From: semantic-release-bot <semantic-release-bot@martynus.net> Date: Sun, 1 May 2022 12:16:47 +0000 Subject: [PATCH] chore(release): 2.5.0 [skip ci] # [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)) --- CHANGELOG.md | 7 +++++++ README.md | 10 +++++----- templates/gitlab-ci-docker-vault.yml | 2 +- templates/gitlab-ci-docker.yml | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3dd5f2..a212a4f 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 8bf4c80..6468531 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 909376b..82cea87 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 82c865d..ec79eac 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: -- GitLab