diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-10-13 13:53:08 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2020-11-14 19:07:24 +0000 |
| commit | 93003fce0e04f09fb405f982b0a2a91c1fd299b9 (patch) | |
| tree | 75c5bf423a6dd45fc8e5c9237e56f13015ab5f3e | |
| parent | 4ae215b4895e6611176d1089fcac0a7d69423220 (diff) | |
| download | libsoup-93003fce0e04f09fb405f982b0a2a91c1fd299b9.tar.gz | |
ci: Use podman to generate images
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 19 |
1 files 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 |