From 407501dc8a3e12aea5c3393a033865bd9e131b36 Mon Sep 17 00:00:00 2001 From: fbt Date: Sat, 6 Mar 2021 08:41:03 +0300 Subject: [PATCH] make ci respect PODMAN_IMAGE too Signed-off-by: fbt --- makepkg-ci | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makepkg-ci b/makepkg-ci index 239d4b4..c4b1e90 100755 --- a/makepkg-ci +++ b/makepkg-ci @@ -1,6 +1,9 @@ #!/usr/bin/env bash shopt -s nullglob +PODMAN_IMAGE=${PODMAN_IMAGE:-'localhost/spark:autobuilder'} +export PODMAN_IMAGE + did="pkg-build-$$.$SRANDOM" mkdir "/tmp/$did" @@ -10,7 +13,7 @@ pkg_url=$2 #podman run --userns=keep-id -u root --rm -v "/tmp/$did:/buildroot" "spark:autobuilder" /build git clone "$pkg_url" "/tmp/$did" cd "/tmp/$did" -PODMAN_IMAGE='localhost/spark:autobuilder' makepkg-podman --noconfirm -sL +makepkg-podman --noconfirm -sL artifacts=( "/tmp/$did/"*.pkg.* ) for i in "${artifacts[@]}"; do