diff --git a/CHANGELOG.md b/CHANGELOG.md index 4890155651d6758bc5777e3df76fb044a5d00f6d..d7c866fd310014526989285a233b5c32510ad933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.1.0](https://gitlab.com/to-be-continuous/docker/compare/5.0.3...5.1.0) (2023-05-27) + + +### Features + +* **workflow:** extend (skip ci) feature ([43ab7e7](https://gitlab.com/to-be-continuous/docker/commit/43ab7e77f94fbd36cf0e0845c5d6efa78c89621b)) + ## [5.0.3](https://gitlab.com/to-be-continuous/docker/compare/5.0.2...5.0.3) (2023-05-17) diff --git a/README.md b/README.md index 8b90368104020986420d87515583af91eb93f94e..96ade753d7986188044be660df27e3b624f81432 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.0.3' + ref: '5.1.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -473,7 +473,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.0.3' + ref: '5.1.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -491,7 +491,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.0.3' + ref: '5.1.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -548,11 +548,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.0.3' + ref: '5.1.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.0.3' + ref: '5.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 67c95ea53cae6bcffd773f6f09f654a1ac7b41b9..855e8030dcdc694af8f27a75b6ed1ed71f0c4b7b 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -11,6 +11,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.0.3"] + command: ["--service", "docker", "5.1.0"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index c2b3145810597e1c33b572aabd1c00539ceb259e..6daf88cab89026ceae87d0bdffd42477ad25a5ff 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -446,7 +446,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.0.3"] + command: ["--service", "docker", "5.1.0"] before_script: - *docker-scripts @@ -476,7 +476,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.0.3"] + command: ["--service", "docker", "5.1.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: