Compare commits

..

No commits in common. "15a8f615d3460cc47f06138314ce20948c0281cb" and "8ecfade5c4acfd6e2e53b15e504cb3bafd0d915f" have entirely different histories.

2 changed files with 4 additions and 7 deletions

View file

@ -4,13 +4,10 @@ script_path="$(dirname "$(realpath "$0")")"
. "$script_path/functions.sh"
assert_prerequisites
image_path="$1"
image_name="$(relative_path_to_image_name "$image_path")"
shift
image_name="$(relative_path_to_image_name "$1")"
# Load config if we have it
[ -f "$script_path/$image_path/control" ] && . "$script_path/$image_path/control"
[ -f "$script_path/$1/control" ] && . "$script_path/$1/control"
extra_args=""
@ -30,4 +27,4 @@ if [ ! -z "$upstream_ver" ]; then
extra_args="$extra_args --build-arg UPSTREAM_VERSION=$upstream_ver"
fi
podman build -t "$image_name" "$script_path/$image_path" $extra_args "$@"
podman build -t "$image_name" "$script_path/$1" $extra_args

View file

@ -1,4 +1,4 @@
FROM docker.io/archlinux:base-20240101.0.204074
FROM docker.io/archlinux:base
RUN echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf