Tweak build script and docker setup

[termux-packages] / scripts / run-docker.sh

diff --git a/scripts/run-docker.sh b/scripts/run-docker.sh
index 5e2ab67..d14127d 100755 (executable)
--- a/scripts/run-docker.sh
+++ b/scripts/run-docker.sh
@@ -1,15 +1,28 @@
 #!/bin/sh
 set -e -u
 
-# Create build output folder if necessary:
-mkdir -p $HOME/termux
+# Read settings from .termuxrc if existing
+test -f $HOME/.termuxrc && . $HOME/.termuxrc
+: ${TERMUX_TOPDIR:="$HOME/.termux-build"}
 
 IMAGE_NAME=termux/package-builder
+CONTAINER_NAME=termux-package-builder
 
-echo "Running container from image '$IMAGE_NAME'..."
+echo "Running container '$CONTAINER_NAME' from image '$IMAGE_NAME'..."
+
+docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
+       echo "Creating new container..."
+       docker run \
+               -d \
+               --name $CONTAINER_NAME \
+               -v $PWD:/root/termux-packages \
+               -t $IMAGE_NAME
+}
+
+if [ "$#" -eq  "0" ]; then
+       docker exec -it $CONTAINER_NAME bash
+else
+       docker exec -it $CONTAINER_NAME $@
+fi
 
-docker run \
-       -v $PWD:/root/termux-packages \
-       -v $HOME/termux:/root/termux \
-       -ti $IMAGE_NAME bash