gentoo-related/gentoo-binpkg-builder
gentoo-related/gentoo-binpkg-builder
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Packages Activity

Switch to upper case for PODMAN_BUILD_ARGS

Browse Source 
Bash variables are typically upper style,
so align with that.
This commit is contained in:
Nils Freydank 2023-10-01 18:50:23 +02:00
parent a554ee9a9f
commit c9f23072ee
Signed by: nfr
GPG Key ID: 0F1DEAB2D36AD112
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-image.sh
View File

@ -16,7 +16,7 @@ BINPKG="${BINPKG:-/var/cache/packages-podman-1}"
LOGDIR="${LOGDIR:-$(pwd)/log}" LOGDIR="${LOGDIR:-$(pwd)/log}"
DOCKER_FILE="${DOCKER_FILE:-$(pwd)/Dockerfile}" DOCKER_FILE="${DOCKER_FILE:-$(pwd)/Dockerfile}"
podman_build_args=( PODMAN_BUILD_ARGS=(
# Do not leak the host's /etc/host into the container. # Do not leak the host's /etc/host into the container.
--no-hosts --no-hosts
# Limit the memory to be used. # Limit the memory to be used.
@ -49,7 +49,7 @@ mkdir -p "${BINPKG}"
mkdir -p "${LOGDIR}" mkdir -p "${LOGDIR}"
podman pull gentoo/stage3:amd64-nomultilib-systemd podman pull gentoo/stage3:amd64-nomultilib-systemd
podman build "${podman_build_args[@]}" podman build "${PODMAN_BUILD_ARGS[@]}"
# Update the tag 'latest'. # Update the tag 'latest'.
podman tag rm "${REGISTRY}:latest" podman tag rm "${REGISTRY}:latest"

4
build-packages.sh
View File

@ -14,7 +14,7 @@ BINPKG="${BINPKG:-/var/cache/packages-podman-1}"
LOGDIR="${LOGDIR:-$(pwd)/log}" LOGDIR="${LOGDIR:-$(pwd)/log}"
PACKAGE_USE="${PACKAGE_USE:-$(pwd)/package.use}" PACKAGE_USE="${PACKAGE_USE:-$(pwd)/package.use}"
podman_build_args=( PODMAN_BUILD_ARGS=(
# Do not leak the host's /etc/host into the container. # Do not leak the host's /etc/host into the container.
--no-hosts --no-hosts
# Remove the container after usage. # Remove the container after usage.
@ -44,7 +44,7 @@ mkdir -p "${DISTFILES}"
mkdir -p "${BINPKG}" mkdir -p "${BINPKG}"
mkdir -p "${LOGDIR}" 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 \ bash -c "emerge --usepkg --newuse --keep-going --oneshot --deep --update @world \
&& emerge @golang-rebuild @rust-rebuild \ && emerge @golang-rebuild @rust-rebuild \
&& eclean-pkg --deep" && eclean-pkg --deep"