[glib-networking/mcatanzaro/podman] Try switching to podman for container generation again

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e1817bd244ba4bfcb6b67b9065cdbf82f966d3c1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Sep 1 18:08:24 2019 -0500

    Try switching to podman for container generation again
    
    Goodbye docker!

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/run-docker.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5075bd..87428fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v6
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v7
 
 fedora-x86_64:
   script:
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index e6d80ce..43c8f57 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:v6"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v7"
 
 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}" --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