diff options
| author | chriseth <chris@ethereum.org> | 2017-03-17 19:59:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 19:59:49 +0800 |
| commit | 248563bf514d8da69dc241af78d1301fa281796b (patch) | |
| tree | 92b82e4c32ae37f14e4cb14bfa30a0ed0ca80c3d | |
| parent | 245c8914cf06b086fc7cd46e4158e9eda2b324ec (diff) | |
| parent | 806b39db022403dd4022f268f5226f5c55388faa (diff) | |
| download | dexon-solidity-248563bf514d8da69dc241af78d1301fa281796b.tar.gz dexon-solidity-248563bf514d8da69dc241af78d1301fa281796b.tar.zst dexon-solidity-248563bf514d8da69dc241af78d1301fa281796b.zip | |
Merge pull request #1795 from ethereum/dockerrelease
Specify docker entry point and only run release on tags.
| -rw-r--r-- | scripts/Dockerfile | 2 | ||||
| -rwxr-xr-x | scripts/docker_deploy.sh | 6 |
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" |