diff --git a/CHANGELOG.md b/CHANGELOG.md index 8549f6db1e7a5a4429df7a626d011aac70ee6153..49aff34e857f7650392da2bb3d6529894c19a818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [3.2.0](https://gitlab.com/to-be-continuous/docker/compare/3.1.1...3.2.0) (2022-10-04) + + +### Features + +* normalize reports ([e8d505f](https://gitlab.com/to-be-continuous/docker/commit/e8d505fea056148389744831a09e9fca978f8f38)) + ## [3.1.1](https://gitlab.com/to-be-continuous/docker/compare/3.1.0...3.1.1) (2022-09-28) diff --git a/README.md b/README.md index fc06a41ec873124c05ec012ca5a1834ab1606e7c..c5170f7304417153baff6c328a4cd305176784df 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.1.1' + ref: '3.2.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -437,7 +437,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.1.1' + ref: '3.2.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -455,7 +455,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.1.1' + ref: '3.2.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -511,11 +511,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.1.1' + ref: '3.2.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.1.1' + ref: '3.2.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 d6b50e4debc70e8f776b6813c7a9c27e1c7fc27c..f6734ec71ec5cb30c45f7d397847e65fd2839427 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.1.1"] + command: ["--service", "docker", "3.2.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 dd4b923fe5a747e6b6ae57479d26149ec5bc858b..2d33dff34a88d059c182b6d18d60e4837ed553cb 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -408,7 +408,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.1.1"] + command: ["--service", "docker", "3.2.0"] before_script: - *docker-scripts @@ -437,7 +437,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.1.1"] + command: ["--service", "docker", "3.2.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: