From c147df99bcc3190a31c90faeab858b2e5e0c14e2 Mon Sep 17 00:00:00 2001
From: Sam Tygier <samtygier@yahoo.co.uk>
Date: Sat, 16 Feb 2019 14:59:32 +0000
Subject: [PATCH] Ensure extra config file is passed to docker

Fixes #253

Rather than use --env-file, which gets overwritten by the regular config file, pass the any arguments to build-docker.sh through to build.sh.
---
 build-docker.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/build-docker.sh b/build-docker.sh
index e56f7d9..45b0d5d 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+BUILD_OPTS="$@"
+
 DOCKER="docker"
 set +e
 $DOCKER ps >/dev/null 2>&1
@@ -13,9 +15,7 @@ if ! $DOCKER ps >/dev/null; then
 fi
 set -e
 
-config_file=()
 if [ -f config ]; then
-	config_file=("--env-file" "$(pwd)/config")
 	source config
 fi
 
@@ -23,9 +23,7 @@ while getopts "c:" flag
 do
 	case "$flag" in
 		c)
-			EXTRA_CONFIG="$OPTARG"
-			config_file=( "${config_file[@]}" "--env-file" "$(pwd)/${EXTRA_CONFIG}")
-			source "$EXTRA_CONFIG"
+			source "$OPTARG"
 			;;
 	esac
 done
@@ -58,20 +56,17 @@ if [ "$CONTAINER_EXISTS" != "" ]; then
 	trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}_cont" SIGINT SIGTERM
 	time $DOCKER run --rm --privileged \
 		--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
-		-e IMG_NAME="${IMG_NAME}"\
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
-	cd /pi-gen; ./build.sh;
+	cd /pi-gen; ./build.sh ${BUILD_OPTS} ;
 	rsync -av work/*/build.log deploy/" &
 	wait "$!"
 else
 	trap "echo 'got CTRL+C... please wait 5s'; $DOCKER stop -t 5 ${CONTAINER_NAME}" SIGINT SIGTERM
 	time $DOCKER run --name "${CONTAINER_NAME}" --privileged \
-		-e IMG_NAME="${IMG_NAME}"\
-		"${config_file[@]}" \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
-	cd /pi-gen; ./build.sh &&
+	cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
 	rsync -av work/*/build.log deploy/" &
 	wait "$!"
 fi