gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Docker image version for develop builds 

Turns out it helps to use the right syntax.

Fixes https://github.com/vector-im/riot-web/issues/12009
This commit is contained in:
Travis Ralston 2020-03-09 19:57:52 -06:00
parent 71f2f0e7c9
commit b0f71bc990
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)