From 1c1f8126d7f36fe55e1650d95e1ab942acb598ff Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 3 Feb 2024 18:21:51 -0500 Subject: [PATCH 1/2] build-image.sh: Support passing arguments to podman build --- build-image.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build-image.sh b/build-image.sh index 485626e..421a3ed 100755 --- a/build-image.sh +++ b/build-image.sh @@ -4,10 +4,13 @@ script_path="$(dirname "$(realpath "$0")")" . "$script_path/functions.sh" assert_prerequisites -image_name="$(relative_path_to_image_name "$1")" +image_path="$1" +image_name="$(relative_path_to_image_name "$image_path")" + +shift # Load config if we have it -[ -f "$script_path/$1/control" ] && . "$script_path/$1/control" +[ -f "$script_path/$image_path/control" ] && . "$script_path/$image_path/control" extra_args="" @@ -27,4 +30,4 @@ if [ ! -z "$upstream_ver" ]; then extra_args="$extra_args --build-arg UPSTREAM_VERSION=$upstream_ver" fi -podman build -t "$image_name" "$script_path/$1" $extra_args +podman build -t "$image_name" "$script_path/$image_path" $extra_args "$@" From 15a8f615d3460cc47f06138314ce20948c0281cb Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 3 Feb 2024 18:22:03 -0500 Subject: [PATCH 2/2] base-archlinux: Refer to specific Arch tagged images --- deps/base-archlinux/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/base-archlinux/Containerfile b/deps/base-archlinux/Containerfile index 74d1ea3..2b24671 100644 --- a/deps/base-archlinux/Containerfile +++ b/deps/base-archlinux/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/archlinux:base +FROM docker.io/archlinux:base-20240101.0.204074 RUN echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf