diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b26266cd5cb1b145deacb39b51666a3cc7cff09..a6bc04da5a310fdcd328ba42a22a32d1d09920d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [2.7.1](https://gitlab.com/to-be-continuous/docker/compare/2.7.0...2.7.1) (2022-06-20) + + +### Bug Fixes + +* **skopeo:** authenticate with skopeo inspect ([53cf10d](https://gitlab.com/to-be-continuous/docker/commit/53cf10d42aa268650b0b61705f8b241eb3e7d2b4)) +* **Trivy:** prefix Trivy report name ([4cec06b](https://gitlab.com/to-be-continuous/docker/commit/4cec06bb5731ced82e3a9fdecfdd82eb54378822)) + # [2.7.0](https://gitlab.com/to-be-continuous/docker/compare/2.6.0...2.7.0) (2022-05-20) diff --git a/README.md b/README.md index d12c289ce1551f33168cae8daf0167dc3dddcce2..f170e352fda5cac9d5ee8fa326784da40905f341 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.0' + ref: '2.7.1' 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.0' + ref: '2.7.1' 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.0' + ref: '2.7.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -416,11 +416,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '2.7.0' + ref: '2.7.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '2.7.0' + ref: '2.7.1' 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 3039a68edee76308c5f23105b20fb75ade584bbb..4bbec59b9076de4df0e290382e11e1a6a4dca7e2 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.0"] + command: ["--service", "docker", "2.7.1"] - 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 cc62e4e1bd1019f6b773e7cbb22afbe25dbb159d..ac14ef61753b2d6da1a5d64a8784b1dd3e7798fd 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -376,7 +376,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.7.0"] + command: ["--service", "docker", "2.7.1"] before_script: - *docker-scripts @@ -405,7 +405,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "2.7.0"] + command: ["--service", "docker", "2.7.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: