From 191b7069b3f56bda17cf882e3489071fd7c45b02 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 26 Nov 2024 08:25:59 +0000
Subject: [PATCH] chore(release): 6.0.0 [skip ci]
# [6.0.0](https://gitlab.com/to-be-continuous/docker/compare/5.14.1...6.0.0) (2024-11-26)
### Code Refactoring
* **trivy:** enforce usage of Trivy environment variables ([e69ce13](https://gitlab.com/to-be-continuous/docker/commit/e69ce13565711b9dac8ee7b7105c8e9061bb3799))
### BREAKING CHANGES
* **trivy:** 4 Trivy configuration params removed in favor of the native Trivy environment variables
---
CHANGELOG.md | 12 ++++++++++++
README.md | 14 +++++++-------
templates/gitlab-ci-docker-ecr.yml | 2 +-
templates/gitlab-ci-docker-gcp.yml | 2 +-
templates/gitlab-ci-docker-vault.yml | 2 +-
templates/gitlab-ci-docker.yml | 4 ++--
6 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57bc439..90fcabd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [6.0.0](https://gitlab.com/to-be-continuous/docker/compare/5.14.1...6.0.0) (2024-11-26)
+
+
+### Code Refactoring
+
+* **trivy:** enforce usage of Trivy environment variables ([e69ce13](https://gitlab.com/to-be-continuous/docker/commit/e69ce13565711b9dac8ee7b7105c8e9061bb3799))
+
+
+### BREAKING CHANGES
+
+* **trivy:** 4 Trivy configuration params removed in favor of the native Trivy environment variables
+
## [5.14.1](https://gitlab.com/to-be-continuous/docker/compare/5.14.0...5.14.1) (2024-11-02)
diff --git a/README.md b/README.md
index 979728c..8ef2418 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`:
```yaml
include:
# 1: include the component
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
# 2: set/override component inputs
inputs:
build-tool: buildah # ⚠ this is only an example
@@ -28,7 +28,7 @@ Add the following to your `.gitlab-ci.yml`:
include:
# 1: include the template
- project: 'to-be-continuous/docker'
- ref: '5.14.1'
+ ref: '6.0.0'
file: '/templates/gitlab-ci-docker.yml'
variables:
@@ -562,7 +562,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry:
```yaml
include:
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
inputs:
snapshot-image: "registry.acme.host/$CI_PROJECT_NAME/snapshot:$CI_COMMIT_REF_SLUG"
release-image: "registry.acme.host/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME"
@@ -577,7 +577,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u
```yaml
include:
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
.docker-base:
parallel:
@@ -630,7 +630,7 @@ With:
```yaml
include:
# main template
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
# Vault variant
- component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-vault@5.7.0
inputs:
@@ -679,7 +679,7 @@ to use the snapshot image repository (will host your snapshot image as well as c
```yaml
include:
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
inputs:
build-tool: "kaniko" # Only Kaniko has been proved to work for this use case YET
# untested & unverified container image
@@ -752,7 +752,7 @@ then set the required configuration.
```yaml
include:
- - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.14.1
+ - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.0.0
inputs:
# untested & unverified container image
snapshot-image: "123456789012.dkr.ecr.us-east-1.amazonaws.com/$CI_PROJECT_PATH_SLUG/snapshot:$CI_COMMIT_REF_SLUG"
diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml
index b2d5a89..2d5e82a 100644
--- a/templates/gitlab-ci-docker-ecr.yml
+++ b/templates/gitlab-ci-docker-ecr.yml
@@ -45,7 +45,7 @@ variables:
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "docker", "5.14.1"]
+ command: ["--service", "docker", "6.0.0"]
- name: "$TBC_AWS_PROVIDER_IMAGE"
alias: "aws-auth-provider"
id_tokens:
diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml
index 1e6fc12..e44d381 100644
--- a/templates/gitlab-ci-docker-gcp.yml
+++ b/templates/gitlab-ci-docker-gcp.yml
@@ -44,7 +44,7 @@ variables:
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "docker", "5.14.1"]
+ command: ["--service", "docker", "6.0.0"]
- name: "$TBC_GCP_PROVIDER_IMAGE"
alias: "gcp-auth-provider"
variables:
diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml
index 45129fb..81e3fdb 100644
--- a/templates/gitlab-ci-docker-vault.yml
+++ b/templates/gitlab-ci-docker-vault.yml
@@ -22,7 +22,7 @@ variables:
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "docker", "5.14.1"]
+ command: ["--service", "docker", "6.0.0"]
- name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider"
variables:
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index 29e5494..e52b559 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -679,7 +679,7 @@ stages:
.docker-base:
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "docker", "5.14.1"]
+ command: ["--service", "docker", "6.0.0"]
before_script:
- !reference [.docker-scripts]
@@ -715,7 +715,7 @@ stages:
_TRACE: "${TRACE}"
services:
- name: "$TBC_TRACKING_IMAGE"
- command: ["--service", "docker", "5.14.1"]
+ command: ["--service", "docker", "6.0.0"]
- name: $DOCKER_DIND_IMAGE
alias: docker
command:
--
GitLab