PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #12670 from vector-im/travis/fix-docker-version

Browse source 
Fix Docker image version for develop builds
This commit is contained in:
Travis Ralston 2020-03-10 09:27:08 -06:00 committed by GitHub
commit 32aa897ef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/docker-write-version.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -ex set -ex
@ -11,7 +11,7 @@ DIST_VERSION=$TAG
# a few SHAs rather than a version. # a few SHAs rather than a version.
# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look # Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look
# for an appropriately tagged branch as well (heads/v1.2.3). # for an appropriately tagged branch as well (heads/v1.2.3).
if [ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ] if [[ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ]]
then then
REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD) JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)