[56a3a46a3ba4fb713fd3e4cfa51a5748abf2c2662fefb0b5a863fdef34572255/mcatanzaro/podman] Attempt to switch from docker to podman



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

    Attempt to switch from docker to podman

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/Dockerfile    |  5 +----
 .gitlab-ci/run-docker.sh | 10 +++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fd55d1..8a6683f 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:v9
 
 fedora-x86_64:
   tags: [ privileged ]
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index a315e2b..3299224 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -3,10 +3,7 @@ FROM fedora:32
 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..b57d1ff 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:v9"
 
 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


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