From df144a6fcb95c61661fa00244f7e91145ce0d251 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Tue, 18 Jul 2017 16:12:16 +0300 Subject: [PATCH] fix docker build --- docker/hub/Dockerfile | 2 +- ethcore/res/ethereum/tests | 2 +- scripts/docker-build.sh | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 scripts/docker-build.sh diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile index 3120eeba703..b1e0663fdfb 100644 --- a/docker/hub/Dockerfile +++ b/docker/hub/Dockerfile @@ -48,7 +48,7 @@ RUN apt-get update && \ # show backtraces RUST_BACKTRACE=1 && \ # build parity - cd /build&&git clone https://github.com/paritytech/parity && \ +cd /build&&git clone https://github.com/paritytech/parity && \ cd parity && \ git pull&& \ git checkout $BUILD_TAG && \ diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests index 4e8b9be3fba..ef191fdc61c 160000 --- a/ethcore/res/ethereum/tests +++ b/ethcore/res/ethereum/tests @@ -1 +1 @@ -Subproject commit 4e8b9be3fba16ec32e0cdf50b8f9329826283aaa +Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2 diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh old mode 100644 new mode 100755 index 7ff368eb4ef..92d35432b16 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -1,6 +1,7 @@ #!/bin/bash cd docker/hub -if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi +DOCKER_BUILD_TAG=$1 echo "Docker build tag: " $DOCKER_BUILD_TAG -docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag $2/parity:$1 . -docker push $2/parity:$1 +docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG . +docker run -it parity/parity:$DOCKER_BUILD_TAG -v +#docker push parity/parity:$DOCKER_BUILD_TAG