From f6fa9cb968b0b455942e1154130812862cffdd4d Mon Sep 17 00:00:00 2001 From: Shane Date: Sun, 2 Jan 2022 09:39:24 +0000 Subject: [PATCH] Make builder script run relative to directory it was called from --- builder/build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/builder/build.sh b/builder/build.sh index 8559eaf..eaae21d 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -2,6 +2,9 @@ # Build a container using the spec file provided +START_DIR=$PWD +cd "$(dirname "$BASH_SOURCE[0]}")" + help_msg(){ echo "Usage: $0 [specfile] [tag]" echo @@ -37,14 +40,14 @@ fetch_packages(){ } build_container(){ - docker build -t $1 -f "$(dirname $0)/Dockerfile" "$PWD/build" + docker build -t $1 -f "Dockerfile" "$START_DIR/build" } -SPEC_FILE=$1 +SPEC_FILE=$START_DIR/$1 TAG=$2 -[ -z "$SPEC_FILE" ] && help_msg "specfile is required" +[ -z "$1" ] && help_msg "specfile is required" [ -z "$TAG" ] && help_msg "tag is required" [ -f "$SPEC_FILE" ] || help_msg "specfile does not exist" @@ -58,4 +61,4 @@ fetch_packages $SPEC_FILE build_container $TAG echo "Start your custom piston container with" -echo "$ docker run --tmpfs /piston/jobs -dit -p 2000:2000 $TAG" \ No newline at end of file +echo "$ docker run --tmpfs /piston/jobs -dit -p 2000:2000 $TAG"