citemplate: avoid the need to upgrade buildah in docker build
authorJordan Petridis <jordan@centricular.com>
Thu, 2 Jul 2020 12:43:13 +0000 (15:43 +0300)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Fri, 3 Jul 2020 09:47:27 +0000 (09:47 +0000)
We only need the newer version from the image, to support
the --arch arg, but we don't really use it yet so we
could live without it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/318>

gitlab/ci_template.yml

index 0d8a876..7f69230 100644 (file)
@@ -205,8 +205,6 @@ variables:
     # using the vfs driver, and this causes errors.
     - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
 
-    - dnf upgrade -y buildah skopeo jq runc
-
     - *check_image_exists
 
     # This part of the job should only ever be possible to be reach in a gst-ci fork
@@ -223,7 +221,6 @@ variables:
     - >
       buildah bud
       --build-arg DEFAULT_BRANCH=$GST_UPSTREAM_BRANCH
-      --arch=${ARCH:=amd64}
       --label ci.job_id=$CI_JOB_ID
       --label pipeline.url=$CI_PIPELINE_URL
       --label git.ref_name=$CI_COMMIT_REF_NAME