From 65eee675a6663ea019d4ec414a2fe7cb19933b47 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:33:46 +0200
Subject: [PATCH] [ci] Update buildah command and version (#2479)
---
cumulus/.gitlab-ci.yml | 2 ++
cumulus/scripts/ci/gitlab/pipeline/publish.yml | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cumulus/.gitlab-ci.yml b/cumulus/.gitlab-ci.yml
index 2e0f6330d70..7166ace649f 100644
--- a/cumulus/.gitlab-ci.yml
+++ b/cumulus/.gitlab-ci.yml
@@ -30,6 +30,8 @@ variables:
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.43"
+ BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
+ BUILDAH_COMMAND: "buildah --storage-driver overlay2"
.common-before-script:
before_script:
diff --git a/cumulus/scripts/ci/gitlab/pipeline/publish.yml b/cumulus/scripts/ci/gitlab/pipeline/publish.yml
index 84f0a576e3b..e59ff167698 100644
--- a/cumulus/scripts/ci/gitlab/pipeline/publish.yml
+++ b/cumulus/scripts/ci/gitlab/pipeline/publish.yml
@@ -2,7 +2,7 @@
# Here are all jobs that are executed during "publish" stage
.build-push-image:
- image: quay.io/buildah/stable:v1.27
+ image: $BUILDAH_IMAGE
variables:
DOCKERFILE: "" # docker/path-to.Dockerfile
IMAGE_NAME: "" # docker.io/paritypr/image_name
@@ -10,7 +10,7 @@
script:
- test "$PARITYPR_USER" -a "$PARITYPR_PASS" ||
( echo "no docker credentials provided"; exit 1 )
- - buildah bud
+ - $BUILDAH_COMMAND build
--format=docker
--build-arg VCS_REF="${CI_COMMIT_SHA}"
--build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
@@ -19,8 +19,8 @@
--file ${DOCKERFILE} .
- echo "$PARITYPR_PASS" |
buildah login --username "$PARITYPR_USER" --password-stdin docker.io
- - buildah info
- - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
+ - $BUILDAH_COMMAND info
+ - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:$VERSION"
after_script:
- buildah logout --all
--
GitLab