From ba1be942bd532b9a012e1ad9aad97b0f3ac3ee0f Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Dec 10 2019 07:32:51 +0000 Subject: Revert "fix names of docker images" This reverts commit d31f6ee3301e79a46bc5b78f624a1549d9804234. --- diff --git a/docker/debian-7-32bit/build.sh b/docker/debian-7-32bit/build.sh index 878f987..e984638 100755 --- a/docker/debian-7-32bit/build.sh +++ b/docker/debian-7-32bit/build.sh @@ -16,4 +16,4 @@ if [[ "$(docker images -q morevnaproject/debian-i386:wheezy 2> /dev/null)" == "" bash ${SCRIPT_DIR}/build-base.sh fi -docker build -t morevnaproject/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 d897e77..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" \ - morevnaproject/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 b620847..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 morevnaproject/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 4240f1c..06c509c 100755 --- a/docker/debian-7-64bit/run.sh +++ b/docker/debian-7-64bit/run.sh @@ -38,6 +38,6 @@ docker run -it \ -e PLATFORM="$PLATFORM" \ -e ARCH="$ARCH" \ -e THREADS="$THREADS" \ - morevnaproject/build-debian-7-64 \ + morevnaproject/builder-64:debian7 \ /build/script/common/manager.sh "$@"