Compare commits
2 commits
8ecfade5c4
...
15a8f615d3
Author | SHA1 | Date | |
---|---|---|---|
15a8f615d3 | |||
1c1f8126d7 |
2 changed files with 7 additions and 4 deletions
|
@ -4,10 +4,13 @@ script_path="$(dirname "$(realpath "$0")")"
|
||||||
. "$script_path/functions.sh"
|
. "$script_path/functions.sh"
|
||||||
assert_prerequisites
|
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
|
# 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=""
|
extra_args=""
|
||||||
|
|
||||||
|
@ -27,4 +30,4 @@ if [ ! -z "$upstream_ver" ]; then
|
||||||
extra_args="$extra_args --build-arg UPSTREAM_VERSION=$upstream_ver"
|
extra_args="$extra_args --build-arg UPSTREAM_VERSION=$upstream_ver"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
podman build -t "$image_name" "$script_path/$1" $extra_args
|
podman build -t "$image_name" "$script_path/$image_path" $extra_args "$@"
|
||||||
|
|
2
deps/base-archlinux/Containerfile
vendored
2
deps/base-archlinux/Containerfile
vendored
|
@ -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
|
RUN echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue