diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e51cd0cd825e599f9afb7934f97200be5bd74e0..614fb16f8eb0b8043b5166dc044941314d3adc28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.13.0](https://gitlab.com/to-be-continuous/docker/compare/5.12.1...5.13.0) (2024-09-15) + + +### Features + +* **trivy:** enable comprehensive priority ([d26a665](https://gitlab.com/to-be-continuous/docker/commit/d26a6659d9c184455f4c6473154621a50af4b6e9)) + ## [5.12.1](https://gitlab.com/to-be-continuous/docker/compare/5.12.0...5.12.1) (2024-09-12) diff --git a/README.md b/README.md index 6a8786a1345a4ebfcaf1a58551bf9aeff1c1fe1b..afa9e68ce0f53fafa4d624cc9355ca706cf32660 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.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.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.12.1' + ref: '5.13.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -544,7 +544,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.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.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" @@ -559,7 +559,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.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.0 .docker-base: parallel: @@ -612,7 +612,7 @@ With: ```yaml include: # main template - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.0 # Vault variant - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-vault@5.7.0 inputs: @@ -661,7 +661,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.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.0 inputs: build-tool: "kaniko" # Only Kaniko has been proved to work for this use case YET # untested & unverified container image @@ -734,7 +734,7 @@ then set the required configuration. ```yaml include: - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.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 130d3d2c7d863c949d0fe60116d97ab4b4a806e0..6e961db8822478eab972b61a55d98466a0826466 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.12.1"] + command: ["--service", "docker", "5.13.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 30e4d00606be067bbfa5ed990793c5cec3592093..8aa07fb09dee12e220776a68e64e9b12763558bd 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.12.1"] + command: ["--service", "docker", "5.13.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 8b848451b7d17cdca86df4a2ada26105a1960396..056661cd15dc93bd16797b5677a1322993e30ac9 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.12.1"] + command: ["--service", "docker", "5.13.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 012236c9b4a95970dde566104f36a2a8ee764de5..4e8fd79622256a2db6f4116b8b538e0720a08e51 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -668,7 +668,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.12.1"] + command: ["--service", "docker", "5.13.0"] before_script: - !reference [.docker-scripts] @@ -704,7 +704,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.12.1"] + command: ["--service", "docker", "5.13.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: