diff --git a/CHANGELOG.md b/CHANGELOG.md index 286d8b48e47e0f65016aee5eccd17c3c0696967f..9eaa1a7a18a57b428b6814b1e9a56e48b277a3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.4.0](https://gitlab.com/to-be-continuous/docker/compare/3.3.0...3.4.0) (2022-12-12) + + +### Features + +* semantic release integration ([fabf9b9](https://gitlab.com/to-be-continuous/docker/commit/fabf9b9b3a9c93d08e89b940f22566e7670ee8be)) + # [3.3.0](https://gitlab.com/to-be-continuous/docker/compare/3.2.2...3.3.0) (2022-11-29) diff --git a/README.md b/README.md index c3371c44a3b4035f6467e4d6aafc2bd79830ab19..1c18702bb9f930ca527e00b536f36c3b467c20dd 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.3.0' + ref: '3.4.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -469,7 +469,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.3.0' + ref: '3.4.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -487,7 +487,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.3.0' + ref: '3.4.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -543,11 +543,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.3.0' + ref: '3.4.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.3.0' + ref: '3.4.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 267c928227f124d0a536199fcc4398880de624c9..7d4f94d39072aaa1aad9574c18561fcbd727852b 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.3.0"] + command: ["--service", "docker", "3.4.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 fb07ca70ba493313ff0f3ecfa12e472adc70d7bb..0db57c2f1b9fa4cf3ae98bcc7c8802be4113c95f 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -412,7 +412,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.3.0"] + command: ["--service", "docker", "3.4.0"] before_script: - *docker-scripts @@ -441,7 +441,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.3.0"] + command: ["--service", "docker", "3.4.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: