diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c47124e79cb5072411d0cf6bfbda37ea6843bf0..d8f18fbeb1309310451216d003d596ee31c3e1de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.13.3](https://gitlab.com/to-be-continuous/docker/compare/5.13.2...5.13.3) (2024-10-24) + + +### Bug Fixes + +* set trivy artifact expiration ([5854b42](https://gitlab.com/to-be-continuous/docker/commit/5854b428f1007c7cde90ad836fba6b9cbcc2a251)) + ## [5.13.2](https://gitlab.com/to-be-continuous/docker/compare/5.13.1...5.13.2) (2024-10-04) diff --git a/README.md b/README.md index a15954885d5d26ed3b4cb8e2c0cf748078c03737..8a940a6d30e5e15a85e3c8121c38b688a4176b99 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.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 # 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.13.2' + ref: '5.13.3' 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.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 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.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 .docker-base: parallel: @@ -612,7 +612,7 @@ With: ```yaml include: # main template - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 # 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.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 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.13.2 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.13.3 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 29e530783ec667399867cac2ea1f5a8f0f82e1e2..1ff3c3b5f53b6097c80acd2ed4301972da2c45c2 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.13.2"] + command: ["--service", "docker", "5.13.3"] - 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 d7ff6520a08e327dd5b1fe3e7c5b1bf4b870ae87..012863947a8b0b1cff7cdadfdce38f4c3fc1de9c 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.13.2"] + command: ["--service", "docker", "5.13.3"] - 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 529af32a0893a489e8bfdfff2036ae4e85984299..a4108346a7785f03650fa0e3b98d4c025ec749bd 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.13.2"] + command: ["--service", "docker", "5.13.3"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index f71aebf1f88b855356588f6df9514e3175163c31..a3f4e5ec23e1779de87dd081d6966fafbe9b706d 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -690,7 +690,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.13.2"] + command: ["--service", "docker", "5.13.3"] before_script: - !reference [.docker-scripts] @@ -726,7 +726,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.13.2"] + command: ["--service", "docker", "5.13.3"] - name: $DOCKER_DIND_IMAGE alias: docker command: