diff --git a/CHANGELOG.md b/CHANGELOG.md index 03da00da284c578baf84c3b50c3a74dc14a8af22..72c9545d1375910350d2a8565890d4da89106e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.1.7](https://gitlab.com/to-be-continuous/docker/compare/6.1.6...6.1.7) (2025-04-25) + + +### Bug Fixes + +* install custom CA certs before awk ([45b8cb3](https://gitlab.com/to-be-continuous/docker/commit/45b8cb399cd5f73455d5e2be81f51e1672b46823)) + ## [6.1.6](https://gitlab.com/to-be-continuous/docker/compare/6.1.5...6.1.6) (2025-04-18) diff --git a/README.md b/README.md index ff75bb0c93428fee4b8fa2d47c6e778a5b118bf5..428fe1300c409b9a18731de9c3ddc24c27e5b3bf 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,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@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 # 2: set/override component inputs inputs: build-tool: buildah # ⚠ this is only an example @@ -30,7 +30,7 @@ Add the following to your `.gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/docker' - ref: '6.1.6' + ref: '6.1.7' file: '/templates/gitlab-ci-docker.yml' variables: @@ -565,7 +565,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@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 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" @@ -580,7 +580,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@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 .docker-base: parallel: @@ -635,9 +635,9 @@ With: ```yaml include: # main template - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 # Vault variant - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-vault@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-vault@6.1.7 inputs: # audience claim for JWT vault-oidc-aud: "https://vault.acme.host" @@ -683,7 +683,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@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 inputs: build-tool: "kaniko" # Only Kaniko has been proved to work for this use case YET # untested & unverified container image @@ -691,7 +691,7 @@ include: # ⚠ don't forget to create the '{GCP_REGION}-docker.pkg.dev/{GCP_PROJECT_ID}/{YOUR_REPOSITORY}/{YOUR_IMAGE_NAME}/snapshot/cache' repo for Kaniko # validated container image (published) release-image: "{GCP_REGION}-docker.pkg.dev/{GCP_PROJECT_ID}/{YOUR_REPOSITORY}/{YOUR_IMAGE_NAME}:$CI_COMMIT_REF_NAME" - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-gcp@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-gcp@6.1.7 inputs: # default WIF provider gcp-oidc-provider: "projects/{GCP_PROJECT_NUMBER}/locations/global/workloadIdentityPools/{YOUR_WIF_POOL_NAME}/providers/gitlab-diod" @@ -756,14 +756,14 @@ then set the required configuration. ```yaml include: - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker@6.1.7 inputs: # untested & unverified container image snapshot-image: "123456789012.dkr.ecr.us-east-1.amazonaws.com/$CI_PROJECT_PATH_SLUG/snapshot:$CI_COMMIT_REF_SLUG" # ⚠ don't forget to create the '123456789012.dkr.ecr.us-east-1.amazonaws.com/$CI_PROJECT_PATH/snapshot/cache' repo for Kaniko # validated container image (published) release-image: "123456789012.dkr.ecr.us-east-1.amazonaws.com/$CI_PROJECT_PATH_SLUG:$CI_COMMIT_REF_NAME" - - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-ecr@6.1.6 + - component: $CI_SERVER_FQDN/to-be-continuous/docker/gitlab-ci-docker-ecr@6.1.7 inputs: # default Role ARN (using OIDC authentication method) aws-oidc-role-arn: "arn:aws:iam::123456789012:role/gitlab-ci" diff --git a/templates/gitlab-ci-docker-ecr.yml b/templates/gitlab-ci-docker-ecr.yml index f3d4320c405e6b049145b5522a48a89f0445e12c..44eb5440ede34177138394cdd1c49653eb7fd32b 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", "6.1.6"] + command: ["--service", "docker", "6.1.7"] - 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 83bbbb6387227d0d4f5426a69c65182ad240527c..8a07e6cafc2c3dc1caee453123ad23c4656b9b63 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", "6.1.6"] + command: ["--service", "docker", "6.1.7"] - 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 a3653a536bc1a2b77751e9ed5516bc05f8970849..54a48c433dd1cc7323e8d9d6e1ff6497de2c8f88 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", "6.1.6"] + command: ["--service", "docker", "6.1.7"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index d6878fa02a0aa84c77b61c74899262d86886b209..9055ba051d38c74339e450901f0e8974760552c7 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -788,7 +788,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "6.1.6"] + command: ["--service", "docker", "6.1.7"] before_script: - !reference [.docker-scripts] @@ -824,7 +824,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "6.1.6"] + command: ["--service", "docker", "6.1.7"] - name: $DOCKER_DIND_IMAGE alias: docker command: