[56a3a46a3ba4fb713fd3e4cfa51a5748abf2c2662fefb0b5a863fdef34572255/mcatanzaro/ci: 87/87] Update CI to glib 2.65.0 and build with podman

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ee95e2d69f1c6549e28003320f2fe60654c2744f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Jul 7 16:07:58 2020 -0500

    Update CI to glib 2.65.0 and build with podman
    
    We need Fedora rawhide to get glib 2.65.0. That's fine. Could also build
    it ourselves, but no need to do that when rawhide works fine.

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/Dockerfile    |  7 ++-----
 .gitlab-ci/run-docker.sh | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fd55d1..57ba3ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v8
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v10
 
 fedora-x86_64:
   tags: [ privileged ]
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index a315e2b..7c63da2 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,12 +1,9 @@
-FROM fedora:32
+FROM fedora:rawhide
 
 RUN dnf update -y \
     && dnf install -y 'dnf-command(builddep)' \
     && dnf builddep -y glib-networking \
-    && dnf install -y gsettings-desktop-schemas \
-                      gcc \
-                      libasan \
-                      openssl-devel \
+    && dnf install -y libasan openssl-devel \
     && dnf clean all
 
 ARG HOST_USER_ID=5555
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 925566c..84d9916 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,17 +2,17 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v8"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v10"
 
 cd "$(dirname "$0")"
 
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
+podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker .
 
 if [ "$1" = "--push" ]; then
-  sudo docker login registry.gitlab.gnome.org
-  sudo docker push $TAG
+  podman login registry.gitlab.gnome.org
+  podman push $TAG
 else
-  sudo docker run --rm \
+  podman run --rm \
       --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
       --tty --interactive "${TAG}" bash
 fi