Refactor of mount and env. handling to read better

build-docker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 BUILD_OPTS="$*"
 
@@ -20,14 +20,13 @@ if [ -f "${DIR}/config" ]; then
 	CONFIG_FILE="${DIR}/config"
 fi
 
-while getopts "c:" flag
-do
+while getopts "c:" flag; do
 	case "${flag}" in
-		c)
-			CONFIG_FILE="${OPTARG}"
-			;;
-		*)
-			;;
+	c)
+		CONFIG_FILE="${OPTARG}"
+		;;
+	*) ;;
+
 	esac
 done
 
@@ -37,26 +36,35 @@ done
 # to build a ready-to-use image without mucking around with saved configs
 # and thus expose private information
 
+# Process from command-line
+CMDLINE_ENV=()
+
 # Get rest of unparsed arguments
-shift $(expr $OPTIND - 1 )
+shift $(expr $OPTIND - 1)
 
-# Convert it into an array
-ADDL_ENV=()
+# Append to our array
 while test $# -gt 0; do
-  ADDL_ENV+=($1)
-  shift
+	CMDLINE_ENV+=($1)
+	shift
 done
 
-# Parse key=value pairs and export them
+# Either way, we may have some key=value pairs now
+# parse and export them so config can get them
+echo "Exporting command-line environment variables..."
 while IFS='=' read -r name value; do
-  # Handle double-quoted ("...") values.
-  if [[ $value =~ ^\"(.*)\"$ ]]; then
-    # Using `read` without `-r` removes the \ from embedded \<char> sequences.
-    IFS= read value <<<"${BASH_REMATCH[1]}"
-  fi
-  # Export so config can access these values
-  export "${name}=${value}"
-done <<< $( IFS=$'\n'; echo "${ADDL_ENV[*]}" )
+
+	# Handle double-quoted ("...") values.
+	if [[ $value =~ ^\"(.*)\"$ ]]; then
+		# Using `read` without `-r` removes the \ from embedded \<char> sequences.
+		IFS= read value <<<"${BASH_REMATCH[1]}"
+	fi
+
+	# Export so config can access these values
+	export "${name}=${value}"
+done <<<$(
+	IFS=$'\n'
+	echo "${CMDLINE_ENV[*]}"
+)
 
 # Ensure that the configuration file is an absolute path
 if test -x /usr/bin/realpath; then
@@ -65,21 +73,55 @@ fi
 
 # Ensure that the confguration file is present
 if test -z "${CONFIG_FILE}"; then
-	echo "Configuration file need to be present in '${DIR}/config' or path passed as parameter"
+	echo "Configuration file needs to be present in '${DIR}/config', or path passed as parameter with -c"
 	exit 1
 else
 	# shellcheck disable=SC1090
 	source ${CONFIG_FILE}
 fi
 
+# Concatenate any command line env to DOCKER_ADDL_ENV
+export DOCKER_ADDL_ENV+=("${CMDLINE_ENV[@]}")
+
+# Convert additional env into docker format 
+# so we can pass it to docker run
+ADDL_ENV=""
+echo "Processing additional environment for docker run..."
+while IFS='=' read -r name value; do
+	# Handle double-quoted ("...") values.
+	if [[ $value =~ ^\"(.*)\"$ ]]; then
+		# Using `read` without `-r` removes the \ from embedded \<char> sequences.
+		IFS= read value <<<"${BASH_REMATCH[1]}"
+	fi
+	# Append to a string in docker env format
+	ADDL_ENV="${ADDL_ENV} -e ${name}=${value}"
+done <<<$(
+	IFS=$'\n'
+	echo "${DOCKER_ADDL_ENV[*]}"
+)
+
+# Ability to add additional mounts so that custom stages can be mounted into the build process
+# without modifying the pi-gen repository
+# Note: Mounts cannot be passed in via the command line
+ADDL_MOUNTS=""
+if [[ ! -z ${DOCKER_ADDL_MOUNTS:=""} ]]; then
+	echo "Processing additional mounts for docker run..."
+	while IFS=' ' read -r mount; do
+		ADDL_MOUNTS="${ADDL_MOUNTS} -v ${mount}"
+	done <<<$(
+		IFS=$'\n'
+		echo "${DOCKER_ADDL_MOUNTS[*]}"
+	)
+fi
+
 CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
 CONTINUE=${CONTINUE:-0}
 PRESERVE_CONTAINER=${PRESERVE_CONTAINER:-0}
 
 if [ -z "${IMG_NAME}" ]; then
 	echo "IMG_NAME not set in 'config'" 1>&2
 	echo 1>&2
-exit 1
+	exit 1
 fi
 
 # Ensure the Git Hash is recorded before entering the docker container
@@ -103,46 +145,24 @@ BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 
 # Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
 case "$(uname -m)" in
-  x86_64|aarch64)
-    BASE_IMAGE=i386/debian:buster
-    ;;
-  *)
-    BASE_IMAGE=debian:buster
-    ;;
+x86_64 | aarch64)
+	BASE_IMAGE=i386/debian:buster
+	;;
+*)
+	BASE_IMAGE=debian:buster
+	;;
 esac
 ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"
 
-# Ability to add additional mounts so that custom stages can be mounted into the build process
-# without modifying the pi-gen repository
-DOCKER_ADDL_MOUNTS=""
-echo "Processing additional mounts..."
-for mount in ${ADDL_MOUNTS:=""}
-do
-	DOCKER_ADDL_MOUNTS="${DOCKER_ADDL_MOUNTS} --volume ${mount}"
-done
-
-# Pass in any additional env that we were given to the docker run commands
-DOCKER_ADDL_ENV=""
-echo "Processing additional env..."
-while IFS='=' read -r name value; do
-  # Handle double-quoted ("...") values.
-  if [[ $value =~ ^\"(.*)\"$ ]]; then
-    # Using `read` without `-r` removes the \ from embedded \<char> sequences.
-    IFS= read value <<<"${BASH_REMATCH[1]}"
-  fi
-  # Append to a string in docker env format
-  DOCKER_ADDL_ENV="${DOCKER_ADDL_ENV} -e ${name}=${value}"
-done <<< $( IFS=$'\n'; echo "${ADDL_ENV[*]}" )
-
 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 \
 		--cap-add=ALL \
 		-v /dev:/dev \
 		-v /lib/modules:/lib/modules \
 		--volume "${CONFIG_FILE}":/config:ro \
-		${DOCKER_ADDL_MOUNTS} \
-		${DOCKER_ADDL_ENV} \
+		${ADDL_MOUNTS} \
+		${ADDL_ENV} \
 		-e "GIT_HASH=${GIT_HASH}" \
 		--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
 		pi-gen \
@@ -157,8 +177,8 @@ else
 		-v /dev:/dev \
 		-v /lib/modules:/lib/modules \
 		--volume "${CONFIG_FILE}":/config:ro \
-		${DOCKER_ADDL_MOUNTS} \
-		${DOCKER_ADDL_ENV} \
+		${ADDL_MOUNTS} \
+		${ADDL_ENV} \
 		-e "GIT_HASH=${GIT_HASH}" \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&