diff --git a/CHANGELOG.md b/CHANGELOG.md index b492edab312cf523cafb32301a5cd634ff634641..84b9bb3ceaae1b5bd841dce8fb25ecca7cf06622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.6.0](https://gitlab.com/to-be-continuous/docker/compare/5.5.6...5.6.0) (2023-12-4) + + +### Features + +* build cache can be disabled (configurable; non-default) ([fe52e0e](https://gitlab.com/to-be-continuous/docker/commit/fe52e0ebd9f851c7976f240942e9917d396bc813)) + ## [5.5.6](https://gitlab.com/to-be-continuous/docker/compare/5.5.5...5.5.6) (2023-12-2) diff --git a/README.md b/README.md index d9dbb855615ffcbe4f3e309be5d7ad7175e590b0..bf7a147136eae4a774660beb85ef652f61f28a86 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `.g ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.5.6' + ref: '5.6.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -505,7 +505,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.5.6' + ref: '5.6.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -523,7 +523,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.5.6' + ref: '5.6.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -581,11 +581,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.5.6' + ref: '5.6.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.5.6' + ref: '5.6.0' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml index 9ec4db701c16da488603c18d7755ea6c3c0dac79..f491cfe276e7107bff90fbecde694592bac0e875 100644 --- a/templates/gitlab-ci-docker-ecr.yml +++ b/templates/gitlab-ci-docker-ecr.yml @@ -8,7 +8,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.6"] + command: ["--service", "docker", "5.6.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 6afb171d7b0584c7be7138fda33ec528a3831f95..5321edec6b488f4201dbc5efc5aeb0ca6dfd00bf 100644 --- a/templates/gitlab-ci-docker-gcp.yml +++ b/templates/gitlab-ci-docker-gcp.yml @@ -8,7 +8,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.6"] + command: ["--service", "docker", "5.6.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 262718fda1a71a9bb016320662abf3976adffb60..5b941397b0de4f299fe1f8ef051b927c2e967fa6 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -12,7 +12,7 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.6"] + command: ["--service", "docker", "5.6.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 ae5259a8e94a776fc734f264a4e2354296fb081f..50f2dc80cb0f8bc2ce1a5c7e60d503a472303450 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -485,7 +485,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.6"] + command: ["--service", "docker", "5.6.0"] before_script: - *docker-scripts @@ -518,7 +518,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.5.6"] + command: ["--service", "docker", "5.6.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: