[gnome-runtime-images/alatiera/ci: 2/2] ci: Use the upstream gitlab image

[Jordan Petridis <jpetridis src gnome org>]

commit c4f6dab8a49db02f943456190ad70072e265ddcc
Author: Jordan Petridis <jordan centricular com>
Date:   Thu Jul 7 19:47:04 2022 +0300

    ci: Use the upstream gitlab image

 .gitlab-ci.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a390b4..0970100 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+image: quay.io/buildah/stable:v1.26
+
 # Buildah can't use 'overlay' driver when running inside docker
 variables:
     STORAGE_DRIVER: 'vfs'
@@ -11,12 +13,7 @@ stages:
 
 default:
     before_script:
-        - dnf install -y buildah podman runc
         - buildah login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
-
-        # Newer versions of podman/buildah try to set overlayfs mount options when
-        # using the vfs driver, and this causes errors.
-        - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf
     interruptible: true
     retry: 1
 
@@ -132,14 +129,12 @@ flat-manager-client:aarch64:
           fi
 
 .vars_aarch64:
-  image: 'registry.fedoraproject.org/fedora:35-aarch64'
   tags:
     - aarch64
   variables:
     ARCH: aarch64
 
 .vars_x86_64:
-  image: 'registry.fedoraproject.org/fedora:35-x86_64'
   tags:
     - x86_64
     - crun