fix docker build in master

genr8r · Jul 18, 2017 · 801fcf3 · 801fcf3
1 parent df144a6
commit 801fcf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -563,7 +563,7 @@ docker-build:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - echo "Tag:" $DOCKER_TAG
     - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
-    - sh scripts/docker-build.sh $DOCKER_TAG parity
+    - sh scripts/docker-build.sh $DOCKER_TAG
     - docker logout
   tags:
     - docker

diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /build
 #ENV for build TAG
 ARG BUILD_TAG
 ENV BUILD_TAG ${BUILD_TAG:-master}
-RUN echo $BUILD_TAG
+RUN echo "Build tag:" $BUILD_TAG
 # install tools and dependencies
 RUN apt-get update && \
         apt-get install -y --force-yes --no-install-recommends \

diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
@@ -4,4 +4,4 @@ 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 .
 docker run -it parity/parity:$DOCKER_BUILD_TAG -v
-#docker push parity/parity:$DOCKER_BUILD_TAG
+docker push parity/parity:$DOCKER_BUILD_TAG