diff --git a/CHANGELOG.md b/CHANGELOG.md index 57bc439b4c7941762da6b5d9f4ac5a19d111a59a..90fcabd456227b9ab356c55ecd21fe8a25fbd8b5 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 979728c26246c3a8d3396651dd0504eb5299b549..8ef241875662ee352fd51c6cdd2657a74d096ec4 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 b2d5a8916185b5ea957d0caa96ed4eb382d1f943..2d5e82a854ff162c0a66932ed18e950ae571c304 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 1e6fc1251e41a8ce4b04ea0dce91b5d6572820bc..e44d381397bf604d3cbcd8ab1fffe372de910b47 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 45129fbfe6b6857888e6c61b04bedad72404fa56..81e3fdb17844dfbcdfc258b79f723f47a92f195c 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 29e5494e43c5180032852ceae12ec50e5e369868..e52b55956a7b33d16898a06ff2cf740b5629cd11 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: