[ci] Update buildah command and version (#1271)

paritytech · Apr 24, 2023 · 8fdfef8 · 8fdfef8
1 parent 637c964
commit 8fdfef8
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,7 +16,8 @@ variables:
   HELM_CUSTOM_VALUES_FILE_2:       "values-polkadot.yaml"
   HELM_REPO:                       "helm/"
   DOCKERFILE_DIRECTORY:            "./"
-  CI_IMAGE:                        "quay.io/buildah/stable:v1.27"
+  CI_IMAGE:                        "quay.io/buildah/stable:v1.29"
+  BUILDAH_COMMAND:                 "buildah --storage-driver overlay2"
   NODE_IMAGE:                      "node:18"
   BENCHMARK_IMAGE:                 "paritytech/node-wrk:latest"
 
@@ -149,23 +150,24 @@ build-docker:
   script:
     - echo building "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
     - if [[ $BUILD_LATEST_IMAGE ]]; then
-        buildah bud
+        $BUILDAH_COMMAND build
         --format=docker
         --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
         --tag "$CONTAINER_REPO:latest" "$DOCKERFILE_DIRECTORY";
       else
-        buildah bud
+        $BUILDAH_COMMAND build
         --format=docker
         --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" "$DOCKERFILE_DIRECTORY";
       fi
+    - $BUILDAH_COMMAND info
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - echo pushing "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
     - if [[ $BUILD_LATEST_IMAGE ]]; then
-        buildah push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG";
-        buildah push --format=v2s2 "$CONTAINER_REPO:latest";
+        $BUILDAH_COMMAND push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG";
+        $BUILDAH_COMMAND push --format=v2s2 "$CONTAINER_REPO:latest";
       else
-        buildah push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG";
+        $BUILDAH_COMMAND push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG";
       fi
 
 push-docker-image-description:
@@ -195,15 +197,16 @@ build-docker-pr:
   script:
     - echo building "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
     - if [[ $BUILD_LATEST_IMAGE ]]; then
-        buildah bud
+        $BUILDAH_COMMAND build
         --format=docker
         --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
         --tag "$CONTAINER_REPO:latest" "$DOCKERFILE_DIRECTORY";
       else
-        buildah bud
+        $BUILDAH_COMMAND build
         --format=docker
         --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" "$DOCKERFILE_DIRECTORY";
       fi
+    - $BUILDAH_COMMAND info
 
 deploy-staging:
   stage:                           deploy-staging