From b0f71bc990c77282790a44b5bedd3bf6de133854 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 9 Mar 2020 19:57:52 -0600 Subject: [PATCH] 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 --- scripts/docker-write-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker-write-version.sh b/scripts/docker-write-version.sh index 774bb49c..14368fd4 100644 --- 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)