diff --git a/CHANGELOG.md b/CHANGELOG.md index a6bc04da5a310fdcd328ba42a22a32d1d09920d0..5b16d3f63d713ada59f40a42bd87c85b99b9a50d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [3.0.0](https://gitlab.com/to-be-continuous/docker/compare/2.7.1...3.0.0) (2022-08-05) + + +### Bug Fixes + +* trigger new major release ([580d3e3](https://gitlab.com/to-be-continuous/docker/commit/580d3e3ef93ab570f30b7c90216301fefbdbf84e)) + + +### BREAKING CHANGES + +* change default workflow from Branch pipeline to MR pipeline + ## [2.7.1](https://gitlab.com/to-be-continuous/docker/compare/2.7.0...2.7.1) (2022-06-20) diff --git a/README.md b/README.md index f170e352fda5cac9d5ee8fa326784da40905f341..b7f2d51fb4b2cb98c592ca5c816c9824c0a5dc78 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.7.1' + ref: '3.0.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.7.1' + ref: '3.0.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.7.1' + ref: '3.0.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -416,11 +416,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.7.1' + ref: '3.0.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.7.1' + ref: '3.0.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 4bbec59b9076de4df0e290382e11e1a6a4dca7e2..6234c7b469f0de3c7e90b1a30b0dd35ddbac8595 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.7.1"] + command: ["--service", "docker", "3.0.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 30701fbf26efed03c23159e52c87d75c124e510b..074a9cf5a2f522f638dc1abbd10a5cb86455db57 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -395,7 +395,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.7.1"] + command: ["--service", "docker", "3.0.0"] before_script: - *docker-scripts @@ -424,7 +424,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.7.1"] + command: ["--service", "docker", "3.0.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: