Commit 73233abe authored Apr 18, 2025 by Cédric OLIVIER

Merge branch 'fix-image-with-awk' into 'master'

fix: switch to official image with awk for buildah and skopeo

Closes #115 and #116

See merge request to-be-continuous/docker!146

parents f5cabdde b8a065ad

README.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ The Docker template uses some global configuration used throughout all jobs.
		\| ---------------------------------------- \| ---------------------------------------------------------------------------------------------------------------------------------------------- \| ----------------------------------------------------------------------------------- \|
		\| `build-tool` / `DOCKER_BUILD_TOOL` \| The build tool to use for building container image, possible values are `kaniko`, `buildah` or `dind` \| `kaniko` \|
		\| `kaniko-image` / `DOCKER_KANIKO_IMAGE` \| The image used to run `kaniko` - _for kaniko build only_ \| `gcr.io/kaniko-project/executor:debug` (use `debug` images for GitLab)<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_KANIKO_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_KANIKO_IMAGE)\|
		\| `buildah-image` / `DOCKER_BUILDAH_IMAGE` \| The image used to run `buildah` - _for buildah build only_ \| `quay.io/buildah/stable`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_BUILDAH_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_BUILDAH_IMAGE)\|
		\| `buildah-image` / `DOCKER_BUILDAH_IMAGE` \| The image used to run `buildah` - _for buildah build only_ \| `quay.io/containers/aio:latest`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_BUILDAH_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_BUILDAH_IMAGE)\|
		\| `image` / `DOCKER_IMAGE` \| The Docker image used to run the docker client (see [full list](https://hub.docker.com/r/library/docker/)) - _for Docker-in-Docker build only_ \| `registry.hub.docker.com/library/docker:latest`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_IMAGE) \|
		\| `dind-image` / `DOCKER_DIND_IMAGE` \| The Docker image used to run the Docker daemon (see [full list](https://hub.docker.com/r/library/docker/)) - _for Docker-in-Docker build only_ \| `registry.hub.docker.com/library/docker:dind`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_DIND_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_DIND_IMAGE)\|
		\| `file` / `DOCKER_FILE` \| The path to your `Dockerfile` \| `Dockerfile` \|
		@@ -466,7 +466,7 @@ This job pushes (_promotes_) the built image as the _release_ image [skopeo](htt

		\| Input / Variable \| Description \| Default value \|
		\| ------------------------------------------------------------------ \| ------------------------------------------------------------------------------------------------------------------------------------------------------------------ \| --------------------------------------------------------------------------------------------------------------------------------------------------------------- \|
		\| `skopeo-image` / `DOCKER_SKOPEO_IMAGE` \| The Docker image used to run [skopeo](https://github.com/containers/skopeo) \| `quay.io/skopeo/stable:latest`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_SKOPEO_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_SKOPEO_IMAGE)\|
		\| `skopeo-image` / `DOCKER_SKOPEO_IMAGE` \| The Docker image used to run [skopeo](https://github.com/containers/skopeo) \| `quay.io/containers/aio:latest`<br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-DOCKER_SKOPEO_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-DOCKER_SKOPEO_IMAGE)\|
		\| `publish-args` / `DOCKER_PUBLISH_ARGS` \| Additional [`skopeo copy` arguments](https://github.com/containers/skopeo/blob/master/docs/skopeo-copy.1.md#options) \| _(none)_ \|
		\| `prod-publish-strategy` / `DOCKER_PROD_PUBLISH_STRATEGY` \| Defines the publish to production strategy. One of `manual` (i.e. _one-click_), `auto` or `none` (disabled). \| `manual` \|
		\| `release-extra-tags-pattern` / `DOCKER_RELEASE_EXTRA_TAGS_PATTERN` \| Defines the image tag pattern that `$DOCKER_RELEASE_IMAGE` should match to push extra tags (supports capturing groups - [see below](#using-extra-tags)) \| `^v?(?P<major>[0-9]+)\\.(?P<minor>[0-9]+)\\.(?P<patch>[0-9]+)(?P<suffix>(?P<prerelease>-[0-9A-Za-z-\\.]+)?(?P<build>\\+[0-9A-Za-z-\\.]+)?)$` _(SemVer pattern)_ \|

kicker.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		{
		"name": "DOCKER_BUILDAH_IMAGE",
		"description": "The image used to run buildah\n\n_for buildah build only_",
		"default": "quay.io/buildah/stable:latest"
		"default": "quay.io/containers/aio:latest"
		},
		{
		"name": "DOCKER_IMAGE",
		@@ -36,7 +36,7 @@
		{
		"name": "DOCKER_SKOPEO_IMAGE",
		"description": "The image used to publish docker image with Skopeo",
		"default": "quay.io/skopeo/stable:latest"
		"default": "quay.io/containers/aio:latest"
		},
		{
		"name": "DOCKER_FILE",

templates/gitlab-ci-docker.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ spec:
		The image used to run buildah

		_for buildah build only_
		default: quay.io/buildah/stable:latest
		default: quay.io/containers/aio:latest
		image:
		description: \|-
		The image used to run the docker client
		@@ -48,7 +48,7 @@ spec:
		default: registry.hub.docker.com/library/docker:dind
		skopeo-image:
		description: The image used to publish docker image with Skopeo
		default: quay.io/skopeo/stable:latest
		default: quay.io/containers/aio:latest
		file:
		description: The path to your `Dockerfile`
		default: Dockerfile