summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Spiers <stow@adamspiers.org>2019-06-28 17:08:48 +0100
committerAdam Spiers <stow@adamspiers.org>2019-06-28 17:08:48 +0100
commitee57b1abc60844c1c5bacb8e92b5a28fdb189fc6 (patch)
tree6e06750bf5c286a80a41c1906689b2cece748ff7
parent6d195f95e0d9f035029402f63a5b452867626053 (diff)
downloadstow-ee57b1abc60844c1c5bacb8e92b5a28fdb189fc6.tar.gz
Make docker scripts use get-version
-rwxr-xr-xbuild-docker.sh2
-rwxr-xr-xtest-docker.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/build-docker.sh b/build-docker.sh
index c8fab5e..59010ef 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -2,7 +2,7 @@
set -eu
-version=$( git describe --match v* --abbrev=0 )
+version=$( tools/get-version )
imagename=stowtest
image=$imagename:$version
diff --git a/test-docker.sh b/test-docker.sh
index 81e820e..f10456d 100755
--- a/test-docker.sh
+++ b/test-docker.sh
@@ -3,6 +3,6 @@
# Test Stow across multiple Perl versions, by executing the
# Docker image built via build-docker.sh.
-version=$( git describe --match v* --abbrev=0 )
+version=$( tools/get-version )
docker run --rm -it -v $(pwd):$(pwd) -w $(pwd) stowtest:$version