Skip to content
Snippets Groups Projects
Commit 2a461ad1 authored by Timo Furrer's avatar Timo Furrer
Browse files

Merge branch 'buildah' into 'main'

feat(ci): switch to buildah

See merge request components/opentofu!106
parents d8235c97 72a07b55
No related branches found
No related tags found
No related merge requests found
......@@ -63,9 +63,6 @@ stages:
- OPENTOFU_VERSION: !reference [.data, supported_versions]
variables:
# Pipeline configuration
DOCKER_DIND_IMAGE: "docker:26.1.4-dind"
# OpenTofu variables
LATEST_OPENTOFU_VERSION: !reference [.data, latest_version]
......@@ -88,31 +85,18 @@ check-semantic-version:
gitlab-opentofu-image:build:
extends: .opentofu-versions
stage: build
services:
- "$DOCKER_DIND_IMAGE"
image: "$DOCKER_DIND_IMAGE"
image: quay.io/containers/buildah:v1.36.0
before_script:
- apk add git
# See note on the `build terraform` job about this image
- docker run --rm --privileged tonistiigi/binfmt
# Registry auth
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
script:
- docker buildx create --use
# NOTE: we disable provenance for now
# because it causes troubles with the registry and older clients.
# See
# - https://gitlab.com/gitlab-org/terraform-images/-/issues/104
# - https://gitlab.com/gitlab-org/terraform-images/-/merge_requests/184#note_1328485943
- docker buildx build
- buildah build
--platform "$PLATFORMS"
--build-arg BASE_IMAGE=$BASE_IMAGE
--build-arg OPENTOFU_VERSION=$OPENTOFU_VERSION
--file Dockerfile
--tag "$GITLAB_OPENTOFU_IMAGE_NAME"
--provenance=false
--push
.
- buildah push "$GITLAB_OPENTOFU_IMAGE_NAME"
rules:
- if: $CI_COMMIT_TAG
- changes:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment