diff --git a/build-image.sh b/build-image.sh index 471a014..234c0eb 100755 --- a/build-image.sh +++ b/build-image.sh @@ -16,7 +16,7 @@ BINPKG="${BINPKG:-/var/cache/packages-podman-1}" LOGDIR="${LOGDIR:-$(pwd)/log}" DOCKER_FILE="${DOCKER_FILE:-$(pwd)/Dockerfile}" -podman_build_args=( +PODMAN_BUILD_ARGS=( # Do not leak the host's /etc/host into the container. --no-hosts # Limit the memory to be used. @@ -49,7 +49,7 @@ mkdir -p "${BINPKG}" mkdir -p "${LOGDIR}" podman pull gentoo/stage3:amd64-nomultilib-systemd -podman build "${podman_build_args[@]}" +podman build "${PODMAN_BUILD_ARGS[@]}" # Update the tag 'latest'. podman tag rm "${REGISTRY}:latest" diff --git a/build-packages.sh b/build-packages.sh index b261ed0..c6188a5 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -14,7 +14,7 @@ BINPKG="${BINPKG:-/var/cache/packages-podman-1}" LOGDIR="${LOGDIR:-$(pwd)/log}" PACKAGE_USE="${PACKAGE_USE:-$(pwd)/package.use}" -podman_build_args=( +PODMAN_BUILD_ARGS=( # Do not leak the host's /etc/host into the container. --no-hosts # Remove the container after usage. @@ -44,7 +44,7 @@ mkdir -p "${DISTFILES}" mkdir -p "${BINPKG}" mkdir -p "${LOGDIR}" -podman run "${podman_build_args[@]}" "${REGISTRY}:${VERSION}" \ +podman run "${PODMAN_BUILD_ARGS[@]}" "${REGISTRY}:${VERSION}" \ bash -c "emerge --usepkg --newuse --keep-going --oneshot --deep --update @world \ && emerge @golang-rebuild @rust-rebuild \ && eclean-pkg --deep"