From 2ea947a7fdb2aba02941076588da5a93c7701dc7 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Jan 09 2019 15:14:20 +0000 Subject: Now Docker images are available for download from Docker Hub --- diff --git a/docker/debian-7-32bit/Dockerfile b/docker/debian-7-32bit/Dockerfile index 7a21140..0dddebb 100644 --- a/docker/debian-7-32bit/Dockerfile +++ b/docker/debian-7-32bit/Dockerfile @@ -1,4 +1,4 @@ -FROM morevna/debian-i386:wheezy +FROM morevnaproject/debian-i386:wheezy ARG ALL_PROXY # set available apt sources diff --git a/docker/debian-7-32bit/build-base.sh b/docker/debian-7-32bit/build-base.sh index a91561f..af8fa41 100755 --- a/docker/debian-7-32bit/build-base.sh +++ b/docker/debian-7-32bit/build-base.sh @@ -4,7 +4,7 @@ set -e arch=i386 suite=wheezy -docker_image="morevna/debian-$arch:$suite" +docker_image="morevnaproject/debian-$arch:$suite" SCRIPT_DIR=$(cd `dirname "$0"`; pwd) BASE_DIR=`dirname "$SCRIPT_DIR"` diff --git a/docker/debian-7-32bit/build.sh b/docker/debian-7-32bit/build.sh index 961d851..e984638 100755 --- a/docker/debian-7-32bit/build.sh +++ b/docker/debian-7-32bit/build.sh @@ -12,8 +12,8 @@ if [ -f $CONFIG_FILE ]; then fi mkdir -p $PACKET_BUILD_DIR -if [[ "$(docker images -q morevna/debian-i386:wheezy 2> /dev/null)" == "" ]]; then +if [[ "$(docker images -q morevnaproject/debian-i386:wheezy 2> /dev/null)" == "" ]]; then bash ${SCRIPT_DIR}/build-base.sh fi -docker build -t morevna/build-debian-7-32 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" +docker build -t morevnaproject/builder-32:debian7 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker/debian-7-32bit/run.sh b/docker/debian-7-32bit/run.sh index 673d198..60e0f5c 100755 --- a/docker/debian-7-32bit/run.sh +++ b/docker/debian-7-32bit/run.sh @@ -39,6 +39,6 @@ docker run -it \ -e PLATFORM="$PLATFORM" \ -e ARCH="$ARCH" \ -e THREADS="$THREADS" \ - morevna/build-debian-7-32 \ + morevnaproject/builder-32:debian7 \ setarch i686 /build/script/common/manager.sh "$@" diff --git a/docker/debian-7-64bit/build.sh b/docker/debian-7-64bit/build.sh index c16624e..a665644 100755 --- a/docker/debian-7-64bit/build.sh +++ b/docker/debian-7-64bit/build.sh @@ -13,4 +13,4 @@ fi export PACKET_BUILD_DIR mkdir -p $PACKET_BUILD_DIR -docker build -t morevna/build-debian-7-64 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" +docker build -t morevnaproject/builder-64:debian7 $DOCKER_BUILD_OPTIONS "$SCRIPT_DIR" diff --git a/docker/debian-7-64bit/run.sh b/docker/debian-7-64bit/run.sh index 0f09c32..a2c6e91 100755 --- a/docker/debian-7-64bit/run.sh +++ b/docker/debian-7-64bit/run.sh @@ -35,6 +35,6 @@ docker run -it \ -e PLATFORM="$PLATFORM" \ -e ARCH="$ARCH" \ -e THREADS="$THREADS" \ - morevna/build-debian-7-64 \ + morevnaproject/builder-64:debian7 \ /build/script/common/manager.sh "$@"