aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2020-01-13 23:23:52 +0100
committerCarlo Landmeter <clandmeter@alpinelinux.org>2020-01-17 10:57:36 +0100
commit7215f7a6723e8840c5ef55d07e88e57a6f24d979 (patch)
tree360ca0bdd494ed32d61ae68599da6af2e3060e03
parent8dd4a740439ea72bb288f5b07cf204e0bdbe42c2 (diff)
downloaddocker-abuild-7215f7a6723e8840c5ef55d07e88e57a6f24d979.tar.bz2
docker-abuild-7215f7a6723e8840c5ef55d07e88e57a6f24d979.tar.xz
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.
-rwxr-xr-xdabuild.in10
1 files 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"