diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26b1cc753..772983158 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -561,9 +561,7 @@ docker-build: - docker info script: - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi - - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass - - sh scripts/docker-build.sh $DOCKER_TAG ethcore - - docker logout + - echo "Tag:" $DOCKER_TAG - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity - sh scripts/docker-build.sh $DOCKER_TAG parity - docker logout diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index c83912080..7ff368eb4 100644 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -1,5 +1,6 @@ #!/bin/bash cd docker/hub if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi +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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3f4cf80ea..d05e6978f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -17,6 +17,6 @@ apps: parts: parity: - source: . + source: .. plugin: rust build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]