diff --git a/CHANGELOG.md b/CHANGELOG.md index ff01e9031a3449d3727a9b3c3822c81eb911a519..0374c330d270967baaf1da4c4005f6a12922282f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.10.0](https://gitlab.com/to-be-continuous/docker/compare/5.9.1...5.10.0) (2024-04-02) + + +### Features + +* **trivy:** enable custom Trivy Java DB repository ([059fda8](https://gitlab.com/to-be-continuous/docker/commit/059fda870eb99b18df835404971e25063c81c7f5)) + ## [5.9.1](https://gitlab.com/to-be-continuous/docker/compare/5.9.0...5.9.1) (2024-03-29) diff --git a/README.md b/README.md index c107fd16522fd5788eb63a5b3295558501016424..ef7cfc342e5ffac7c3dea527608b6fd45b9ec957 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: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.9.1 + - component: gitlab.com/to-be-continuous/docker/gitlab-ci-docker@5.10.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.9.1' + ref: '5.10.0' file: '/templates/gitlab-ci-docker.yml' variables: diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml index 3606e5356df3ac11af3d681cd038e7723b92e970..87583d58b21acfff7aa16be06452bbb7547aa2b9 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.9.1"] + command: ["--service", "docker", "5.10.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 daa65e57e1281020a4168db5b90874c13873681a..7da4f379fd2bd5b439a01c92108eebd7264c7a19 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.9.1"] + command: ["--service", "docker", "5.10.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 c8782691e5a425520748405a9535289f85cc8657..78c2c8fd7e1e62cf1e6d6d246b990639a46c66e2 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.9.1"] + command: ["--service", "docker", "5.10.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 24ec874374612f8b17435925d025d430a84f71b9..14960ce8eef7016ebcb33b42591028a9ea2eac3b 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -661,7 +661,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.9.1"] + command: ["--service", "docker", "5.10.0"] before_script: - !reference [.docker-scripts] @@ -694,7 +694,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.9.1"] + command: ["--service", "docker", "5.10.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: