[libsoup/wip/soup-uri-removal] ci: Use podman to generate images
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/soup-uri-removal] ci: Use podman to generate images
- Date: Tue, 13 Oct 2020 19:04:20 +0000 (UTC)
commit 1793b41aefe9bcc2e8a21511a186218d8a80dcbb
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue Oct 13 13:53:08 2020 -0500
ci: Use podman to generate images
.gitlab-ci/run-docker.sh | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index d7d36b2b..7e89d388 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -4,25 +4,14 @@ set -e
TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v5"
-SUDO_CMD="sudo"
-if docker -v |& grep -q podman; then
- # Using podman
- SUDO_CMD=""
- # Docker is actually implemented by podman, and its OCI output
- # is incompatible with some of the dockerd instances on GitLab
- # CI runners.
- export BUILDAH_FORMAT=docker
-fi
-
cd "$(dirname "$0")"
-$SUDO_CMD 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_CMD docker login registry.gitlab.gnome.org
- $SUDO_CMD docker push $TAG
+ podman login registry.gitlab.gnome.org
+ podman push $TAG
else
- $SUDO_CMD 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]