Merge pull request #1795 from ethereum/dockerrelease

Specify docker entry point and only run release on tags.
This commit is contained in:
chriseth 2017-03-17 12:59:49 +01:00 committed by GitHub
commit 248563bf51
2 changed files with 4 additions and 4 deletions

View File

@ -14,3 +14,5 @@ make solc && install -s solc/solc /usr/bin &&\
cd / && rm -rf solidity &&\ cd / && rm -rf solidity &&\
apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev &&\ apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev &&\
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ENTRYPOINT ["/usr/bin/solc"]

View File

@ -10,13 +10,11 @@ then
docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT" docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"
docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"; docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT";
docker push ethereum/solc:nightly; docker push ethereum/solc:nightly;
elif [ "$TRAVIS_BRANCH" = "release" ]
then
docker tag ethereum/solc:build ethereum/solc:stable;
docker push ethereum/solc:stable;
elif [ "$TRAVIS_TAG" = v"$version" ] elif [ "$TRAVIS_TAG" = v"$version" ]
then then
docker tag ethereum/solc:build ethereum/solc:stable;
docker tag ethereum/solc:build ethereum/solc:"$version"; docker tag ethereum/solc:build ethereum/solc:"$version";
docker push ethereum/solc:stable;
docker push ethereum/solc:"$version"; docker push ethereum/solc:"$version";
else else
echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG" echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG"