Merge branch 'master' into refactor/hashdb-generic

* master: scripts: fix docker build tag on latest using master (#8952)
openethereum · Jun 25, 2018 · 027862a · 027862a
2 parents e54ff1f + dec390a
commit 027862a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
@@ -2,6 +2,10 @@
 cd docker/hub
 DOCKER_BUILD_TAG=$1
 echo "Docker build tag: " $DOCKER_BUILD_TAG
-docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
+if [[ "$DOCKER_BUILD_TAG" = "latest" ]]; then
+	docker build --build-arg BUILD_TAG="master" --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
+else
+	docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag parity/parity:$DOCKER_BUILD_TAG .
+fi
 docker run -it parity/parity:$DOCKER_BUILD_TAG -v
 docker push parity/parity:$DOCKER_BUILD_TAG