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

turt2live · web-flow · commit 32aa897ef808 · 2020-03-10T09:27:08.000-06:00
Fix Docker image version for develop builds
diff --git a/scripts/docker-write-version.sh b/scripts/docker-write-version.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -ex
 
@@ -11,7 +11,7 @@ DIST_VERSION=$TAG
 # 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
 # for an appropriately tagged branch as well (heads/v1.2.3).
-if [ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ]
+if [[ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ]]
 then
     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)
