diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d34a8510a59f58ce64a6b1d52edbd35e42ff6a..d97dd3d49771020148581062bd0c399553b8479b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.5.0](https://gitlab.com/to-be-continuous/docker/compare/5.4.1...5.5.0) (2023-09-30) + + +### Features + +* **ecr:** add Amazon ECR variant ([7b0b1d9](https://gitlab.com/to-be-continuous/docker/commit/7b0b1d966c4d0c88152d0bda40715a605f712b2b)) + ## [5.4.1](https://gitlab.com/to-be-continuous/docker/compare/5.4.0...5.4.1) (2023-09-27) diff --git a/README.md b/README.md index acba3310c695c0280ccbdbcab67cd4d1b96c0f16..422a4eaa7194dbfa2c7bc16a3106c6cc365b1075 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.4.1' + ref: '5.5.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -518,7 +518,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '5.4.1' + ref: '5.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -536,7 +536,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.4.1' + ref: '5.5.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -594,11 +594,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '5.4.1' + ref: '5.5.0' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '5.4.1' + ref: '5.5.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 b6d9ac72359d8363736c85fe594f90d15370e9f3..8c50985802f8a37018ff57fb1a17db73cc7c8973 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.4.1"] + command: ["--service", "docker", "5.5.0"] - name: "$TBC_AWS_AUTH_PROVIDER" alias: "aws-auth-provider" id_tokens: diff --git a/templates/gitlab-ci-docker-gcp.yml b/templates/gitlab-ci-docker-gcp.yml index d2ee678200224156b8a6b53626ed2855cb62d1c7..596cf7b979f5cb201c5945bfdcc38839f37d2fc0 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.4.1"] + command: ["--service", "docker", "5.5.0"] - name: "$TBC_GCP_AUTH_PROVIDER" alias: "gcp-auth-provider" variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index 1c2bfbdf0837342e5b395df87b4549019624bc28..611b8ca84b29469c169be733385cbe8ac6bc5d7b 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.4.1"] + command: ["--service", "docker", "5.5.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 f611128d0e47bb62a569c7b5999265c881a8f647..b122d7091746b93c2ee5edf2d3ab5908769d713f 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -475,7 +475,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.4.1"] + command: ["--service", "docker", "5.5.0"] before_script: - *docker-scripts @@ -508,7 +508,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.4.1"] + command: ["--service", "docker", "5.5.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: