From 7215f7a6723e8840c5ef55d07e88e57a6f24d979 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Mon, 13 Jan 2020 23:23:52 +0100 Subject: remove check for packages dir Packages dir is a docker volume and the mount point will be automatically created. Permissions will be correct from entrypoint. --- dabuild.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dabuild.in b/dabuild.in index 6839e8d..78ec170 100755 --- a/dabuild.in +++ b/dabuild.in @@ -67,16 +67,10 @@ else esac fi -## check $DABUILD_PACKAGES is a writable directory +## set packages directory based on aports location if not set +## FIXME this will not append release dir if set manually ABUILD_PACKAGES=${DABUILD_PACKAGES:-${PWD%/aports/*}/packages/${ALPINE_RELEASE}} -mkdir -p $ABUILD_PACKAGES -if [ ! \( -d "$ABUILD_PACKAGES" -a -w "$ABUILD_PACKAGES" \) ]; then - die "Error: invalid or unwritable packages directory specified!" \ - "ABUILD_PACKAGES = '$ABUILD_PACKAGES'" \ - "DABUILD_PACKAGES = '$DABUILD_PACKAGES'" -fi - ## setup volumes; use named volumes as cache if desired ABUILD_VOLUMES="-v ${PWD%/aports/*}/aports:/home/builder/aports \ -v ${ABUILD_PACKAGES}:/home/builder/packages" -- cgit v1.3