From 3deeb3bdefa5ac3e8922930a6895bb9b20bacb8a Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Fri, 17 May 2019 08:00:13 +0000 Subject: dabuild: refactor volumes - printf -v is not posix - check for abuild.conf instead of alpine-release - check if distfiles is writable - do not mount /var/cache/apk as this will break apkindex - do not create volumes from makefile --- Makefile | 1 - dabuild.in | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 326c30b..6daa151 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,6 @@ build-%: # engine, DOCKER_BUILDKIT appears to have some strange behaviour so turning # it off for now DOCKER_BUILDKIT=0 docker build $$DOCKER_FLAGS -t $(IMG):$* . - for v in $(VOLS) ; do docker volume create abuild-$*-$${v//\//_} ; done $(RM) Dockerfile .PHONY: push diff --git a/dabuild.in b/dabuild.in index 7fe4dde..eefa079 100755 --- a/dabuild.in +++ b/dabuild.in @@ -58,17 +58,16 @@ if [ ! \( -d "$ABUILD_PACKAGES" -a -w "$ABUILD_PACKAGES" \) ]; then fi ## setup volumes; use named volumes as cache if desired -printf -v ABUILD_VOLUMES "%s "\ - "-v ${HOME}/.abuild:/home/builder/.abuild" \ - "-v ${PWD%/aports*}/aports:/home/builder/aports" \ - "-v ${ABUILD_PACKAGES}:/home/builder/packages" - -if [ -s "/etc/alpine-release" ]; then - printf -v ABUILD_VOLUMES "%s "\ - $ABUILD_VOLUMES \ - "-v /etc/abuild.conf:/etc/abuild.conf"\ - "-v /var/cache/distfiles:/var/cache/distfiles"\ - "-v /var/cache/apk:/var/cache/apk" +ABUILD_VOLUMES="-v ${HOME}/.abuild:/home/builder/.abuild \ + -v ${PWD%/aports*}/aports:/home/builder/aports \ + -v ${ABUILD_PACKAGES}:/home/builder/packages" + +if [ -f "/etc/abuild.conf" ]; then + ABUILD_VOLUMES="$ABUILD_VOLUMES -v /etc/abuild.conf:/etc/abuild.conf" +fi + +if [ -w "/var/cache/distfiles" ]; then + ABUILD_VOLUMES="$ABUILD_VOLUMES -v /var/cache/distfiles:/var/cache/distfiles" fi if [ "$DABUILD_CACHE" = "true" ]; then -- cgit v1.2.3