aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-03-17 01:13:34 +0800
committerchriseth <chris@ethereum.org>2017-03-17 01:13:34 +0800
commit806b39db022403dd4022f268f5226f5c55388faa (patch)
tree07f1d6d52adb4854354d6d1212713a6e0f09be84
parent58334cf4ac1cf61e5296b82ada48a2eb690ed369 (diff)
downloaddexon-solidity-806b39db022403dd4022f268f5226f5c55388faa.tar.gz
dexon-solidity-806b39db022403dd4022f268f5226f5c55388faa.tar.zst
dexon-solidity-806b39db022403dd4022f268f5226f5c55388faa.zip
Specify docker entry point and only run release on tags.
-rw-r--r--scripts/Dockerfile2
-rwxr-xr-xscripts/docker_deploy.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index ad448fd3..c984ce99 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -14,3 +14,5 @@ make solc && install -s solc/solc /usr/bin &&\
cd / && rm -rf solidity &&\
apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev &&\
rm -rf /var/cache/apk/*
+
+ENTRYPOINT ["/usr/bin/solc"] \ No newline at end of file
diff --git a/scripts/docker_deploy.sh b/scripts/docker_deploy.sh
index d2810a3e..0abde840 100755
--- a/scripts/docker_deploy.sh
+++ b/scripts/docker_deploy.sh
@@ -10,13 +10,11 @@ then
docker tag ethereum/solc:build ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT"
docker push ethereum/solc:nightly-"$version"-"$TRAVIS_COMMIT";
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" ]
then
+ docker tag ethereum/solc:build ethereum/solc:stable;
docker tag ethereum/solc:build ethereum/solc:"$version";
+ docker push ethereum/solc:stable;
docker push ethereum/solc:"$version";
else
echo "Not publishing docker image from branch $TRAVIS_BRANCH or tag $TRAVIS_TAG"