ci: switched build implementation to buildx

This commit is contained in:
ITQ
2025-12-14 15:05:31 +03:00
parent 5f355353fb
commit 6d44e336e3
+20 -26
View File
@@ -39,15 +39,6 @@ cache:
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
.buildah-job: &buildah-job
image: quay.io/containers/buildah:latest
variables:
STORAGE_DRIVER: vfs
BUILDAH_FORMAT: oci
BUILDAH_ISOLATION: chroot
before_script:
- buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
.trivy-fs-template: &trivy-fs-scan .trivy-fs-template: &trivy-fs-scan
image: image:
name: docker.io/aquasec/trivy:latest name: docker.io/aquasec/trivy:latest
@@ -129,20 +120,23 @@ cache:
# when: on_success # when: on_success
.build-template: &build-config .build-template: &build-config
<<: *buildah-job <<: *docker-job
stage: build stage: build
variables:
DOCKER_BUILDKIT: 1
BUILDKIT_INLINE_CACHE: 1
script: script:
- docker buildx create --use || true
- | - |
buildah bud \ docker buildx build . \
--tag $IMAGE_NAME:$CI_COMMIT_SHA \ -t $IMAGE_NAME:$CI_COMMIT_SHA \
--file $CONTAINERFILE \ -f $CONTAINERFILE \
--target $BUILDTARGET \ --target $BUILDTARGET \
--push \
--build-arg SERVICE_NAME=${SERVICE_NAME} \ --build-arg SERVICE_NAME=${SERVICE_NAME} \
--layers \ --build-arg BUILDKIT_INLINE_CACHE=1 \
--cache-from $IMAGE_NAME-cache \ --cache-from type=registry,ref=$IMAGE_NAME-cache \
--cache-to $IMAGE_NAME-cache \ --cache-to type=registry,ref=$IMAGE_NAME-cache,mode=max,oci-mediatypes=true,image-manifest=true,compression=zstd
.
- buildah push $IMAGE_NAME:$CI_COMMIT_SHA
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always when: always
@@ -153,26 +147,26 @@ cache:
allow_failure: true allow_failure: true
.tag-template: &tag-config .tag-template: &tag-config
<<: *buildah-job <<: *docker-job
stage: tag stage: tag
script: script:
- | - |
set -euo pipefail set -euo pipefail
buildah pull $IMAGE_NAME:$CI_COMMIT_SHA docker pull "$IMAGE_NAME:$CI_COMMIT_SHA"
if [ -n "${CI_COMMIT_TAG:-}" ]; then if [ -n "${CI_COMMIT_TAG:-}" ]; then
buildah tag $IMAGE_NAME:$CI_COMMIT_SHA $IMAGE_NAME:$CI_COMMIT_TAG docker tag "$IMAGE_NAME:$CI_COMMIT_SHA" "$IMAGE_NAME:$CI_COMMIT_TAG"
buildah push $IMAGE_NAME:$CI_COMMIT_TAG docker push "$IMAGE_NAME:$CI_COMMIT_TAG"
fi fi
if [ -n "${CI_COMMIT_BRANCH:-}" ]; then if [ -n "${CI_COMMIT_BRANCH:-}" ]; then
buildah tag $IMAGE_NAME:$CI_COMMIT_SHA $IMAGE_NAME:$CI_COMMIT_REF_SLUG docker tag "$IMAGE_NAME:$CI_COMMIT_SHA" "$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
buildah push $IMAGE_NAME:$CI_COMMIT_REF_SLUG docker push "$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
buildah tag $IMAGE_NAME:$CI_COMMIT_SHA $IMAGE_NAME:latest docker tag "$IMAGE_NAME:$CI_COMMIT_SHA" "$IMAGE_NAME:latest"
buildah push $IMAGE_NAME:latest docker push "$IMAGE_NAME:latest"
fi fi
fi fi
rules: rules: