From 68478587f9dd47eb7baf531b58b6d5dd672ae064 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Sep 29 2016 10:05:53 +0000 Subject: fix docker build script --- diff --git a/docker-builder-i386/build.sh b/docker-builder-i386/build.sh index 8d92e21..0d76147 100755 --- a/docker-builder-i386/build.sh +++ b/docker-builder-i386/build.sh @@ -2,5 +2,15 @@ SCRIPT_FILE=`realpath "$0"` SCRIPT_DIR=`dirname "$SCRIPT_FILE"` +BASE_DIR=`dirname "$SCRIPT_DIR"` + +CONFIG_FILE="$BASE_DIR/config.sh" +PACKET_BUILD_DIR="$BUILD_DIR/packet" +SCRIPT_BUILD_DIR="$BUILD_DIR/script" +if [ -f $CONFIG_FILE ]; then + source $CONFIG_FILE +fi +export PACKET_BUILD_DIR +mkdir -p $PACKET_BUILD_DIR docker build -t my/builder-i386 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker-builder/build.sh b/docker-builder/build.sh index 09e245a..0a5fa8f 100755 --- a/docker-builder/build.sh +++ b/docker-builder/build.sh @@ -13,5 +13,4 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR - docker build -t my/builder $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR"