[gnome-runtime-images/alatiera/foo] Drop privileged tag



commit ee8113564838a3e5b46cf5d60248d197b77548e6
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Jul 20 19:48:06 2020 +0200

    Drop privileged tag

 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbea534..29c0251 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
-image: 'registry.fedoraproject.org/fedora:30'
+image: 'registry.fedoraproject.org/fedora:32'
 
 # Buildah can't use 'overlay' driver when running inside docker
 variables:
-    STORAGE_DRIVER: vfs
-    BUILDAH_FORMAT: docker
+    STORAGE_DRIVER: 'vfs'
+    BUILDAH_FORMAT: 'docker'
+    BUILDAH_ISOLATION: 'chroot'
 
 stages:
     - base
@@ -11,10 +12,8 @@ stages:
     - rust_bundle
 
 default:
-    tags:
-        - privileged
     before_script:
-        - dnf install -y buildah podman
+        - 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
@@ -36,6 +35,9 @@ default:
               buildah push ${DOCKERIMAGE}
           fi
     after_script:
+        # 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
         # don't try to use systemd/journald
         - |
           cat >> /etc/containers/libpod.conf << END


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]