diff --git a/CHANGELOG.md b/CHANGELOG.md index 953e94a5822a8f37beb8968a28b4774c0d0ebb84..391292c442a8b40c59967032a7ae0ff1b9cfdfb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.12.0](https://gitlab.com/to-be-continuous/docker/compare/5.11.1...5.12.0) (2024-08-26) + + +### Features + +* introduce variable for additional docker/buildah push arguments ([9de48b2](https://gitlab.com/to-be-continuous/docker/commit/9de48b24c1512cb9f5c8b7e26d33cea1bc5504e2)) + ## [5.11.1](https://gitlab.com/to-be-continuous/docker/compare/5.11.0...5.11.1) (2024-08-13) diff --git a/README.md b/README.md index 39d90d1f6be76974aa265419ca11c36fa6a63d73..b086a85f441ce471780f4f844a7908ac30811366 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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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.11.1' + ref: '5.12.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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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.11.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@5.12.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 47067acd7090974ca16fd1570802ea3f1cbc6ffc..fee78fe138af70333e626874990b7cdab94c5f8a 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.11.1"] + command: ["--service", "docker", "5.12.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 f88bd780c59431bcf4186d8fa6827de8eda93c31..3632573329fcbdf23a6a88be6eb6249d81e23d88 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.11.1"] + command: ["--service", "docker", "5.12.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 18cee8870d9844bfb7bc7c7e975889fe4c80aedd..5a06bb88dd901acfda8d6789f51ad49e567b4cf3 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.11.1"] + command: ["--service", "docker", "5.12.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 ed38c8916b198badc274c183691b1e8ca612029c..3488c3ae94bb5d2bf12ef486edaf3be674e19097 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.11.1"] + command: ["--service", "docker", "5.12.0"] before_script: - !reference [.docker-scripts] @@ -704,7 +704,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "5.11.1"] + command: ["--service", "docker", "5.12.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: