[glib-networking] Revert "ci: docker -> podman"



commit f27692172c14d94d2cbb3a7ab101fd169a5e8c1f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Aug 19 16:18:23 2019 -0500

    Revert "ci: docker -> podman"
    
    This reverts commit 1590ea82d8ccbb65628a4379a3e55564d681090c.

 .gitlab-ci/run-docker.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 8ded926..3a66ba9 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:v5"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v4"
 
 cd "$(dirname "$0")"
 
-podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" .
+sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
 
 if [ "$1" = "--push" ]; then
-  podman login registry.gitlab.gnome.org
-  podman push $TAG
+  sudo docker login registry.gitlab.gnome.org
+  sudo docker push $TAG
 else
-  podman run --rm \
+  sudo docker 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]