grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix docker build in beta

Browse Source
This commit is contained in:
Denis S. Soldatov aka General-Beck 2017-07-18 16:13:19 +03:00
parent ac02d12fa8
commit 96e60d9c91
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -77,7 +77,7 @@ linux-snap:
- echo "Version:"$VER - echo "Version:"$VER
- snapcraft - snapcraft
- ls - ls
#- cp "parity_"$CI_BUILD"_REF_NAME_amd64.snap" "parity_"$VER"_amd64.snap" - cp "parity_"$CI_BUILD"_REF_NAME_amd64.snap" "parity_"$VER"_amd64.snap"
- md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5" - md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
- aws configure set aws_access_key_id $s3_key - aws configure set aws_access_key_id $s3_key
- aws configure set aws_secret_access_key $s3_secret - aws configure set aws_secret_access_key $s3_secret
@ -561,6 +561,7 @@ docker-build:
- docker info - docker info
script: script:
- if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi - 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 - 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 parity
- docker logout - docker logout

4
docker/hub/Dockerfile
View File

@ -4,7 +4,7 @@ WORKDIR /build
#ENV for build TAG #ENV for build TAG
ARG BUILD_TAG ARG BUILD_TAG
ENV BUILD_TAG ${BUILD_TAG:-master} ENV BUILD_TAG ${BUILD_TAG:-master}
RUN echo $BUILD_TAG RUN echo "Build tag:" $BUILD_TAG
# install tools and dependencies # install tools and dependencies
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --force-yes --no-install-recommends \ apt-get install -y --force-yes --no-install-recommends \
@ -48,7 +48,7 @@ RUN apt-get update && \
# show backtraces # show backtraces
RUST_BACKTRACE=1 && \ RUST_BACKTRACE=1 && \
# build parity # build parity
cd /build&&git clone https://github.com/paritytech/parity && \ cd /build&&git clone https://github.com/paritytech/parity && \
cd parity && \ cd parity && \
git pull&& \ git pull&& \
git checkout $BUILD_TAG && \ git checkout $BUILD_TAG && \

2
ethcore/res/ethereum/tests

@ -1 +1 @@
Subproject commit 4e8b9be3fba16ec32e0cdf50b8f9329826283aaa Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2

8
scripts/docker-build.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
cd docker/hub cd docker/hub
if [ "$1" == "latest" ]; then DOCKER_BUILD_TAG="beta-release"; fi DOCKER_BUILD_TAG=$1
docker build --build-arg BUILD_TAG=$DOCKER_BUILD_TAG --no-cache=true --tag $2/parity:$1 . echo "Docker build tag: " $DOCKER_BUILD_TAG
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