diff --git a/docker/build.sh b/docker/build.sh new file mode 100755 index 0000000..73cf955 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + + +SCRIPT_DIR=$(cd `dirname "$0"`; pwd) + +${SCRIPT_DIR}/debian-7-64bit/build.sh +${SCRIPT_DIR}/debian-7-32bit/build.sh diff --git a/docker/debian-7-32bit/build.sh b/docker/debian-7-32bit/build.sh index d088a29..8f22c1d 100755 --- a/docker/debian-7-32bit/build.sh +++ b/docker/debian-7-32bit/build.sh @@ -14,4 +14,4 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR -docker build -t my/builder-i386 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" +docker build -t morevna/build-debian-7-32 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker/debian-7-32bit/run.sh b/docker/debian-7-32bit/run.sh index 67fb260..a14cbb8 100755 --- a/docker/debian-7-32bit/run.sh +++ b/docker/debian-7-32bit/run.sh @@ -17,16 +17,16 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR -docker stop "builder-i386" || true -docker rm "builder-i386" || true +docker stop "build-debian-7-32" || true +docker rm "build-debian-7-32" || true docker run -it \ - --name "builder-i386" \ + --name "build-debian-7-32" \ $DOCKER_RUN_OPTIONS \ --privileged=true \ -v "$PACKET_BUILD_DIR:/build/packet" \ -v "$SCRIPT_BUILD_DIR:/build/script" \ -e PLATFORM=linux-i386 \ - my/builder-i386 \ + morevna/build-debian-7-32 \ setarch i686 /build/script/common/manager.sh "$@" diff --git a/docker/debian-7-64bit/build.sh b/docker/debian-7-64bit/build.sh index ff7c574..8b42466 100755 --- a/docker/debian-7-64bit/build.sh +++ b/docker/debian-7-64bit/build.sh @@ -14,4 +14,4 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR -docker build -t my/builder $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" +docker build -t morevna/build-debian-7-64 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker/debian-7-64bit/run.sh b/docker/debian-7-64bit/run.sh index e976d64..f927d0b 100755 --- a/docker/debian-7-64bit/run.sh +++ b/docker/debian-7-64bit/run.sh @@ -17,15 +17,15 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR -docker stop "builder" || true -docker rm "builder" || true +docker stop "build-debian-7-64" || true +docker rm "build-debian-7-64" || true docker run -it \ - --name "builder" \ + --name "build-debian-7-64" \ --privileged=true \ $DOCKER_RUN_OPTIONS \ -v "$PACKET_BUILD_DIR:/build/packet" \ -v "$SCRIPT_BUILD_DIR:/build/script" \ - my/builder \ + morevna/build-debian-7-64 \ /build/script/common/manager.sh "$@" diff --git a/readme b/readme index 75ed03d..c39cce4 100644 --- a/readme +++ b/readme @@ -1,6 +1,6 @@ Build docker: - cd docker-builder + cd docker ./build.sh # sudo? Example usage: