TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-07 15:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #761 from eikek/docker-build-fix

Browse Source 
Make detecting version more reliable
This commit is contained in:
mergify[bot] 2021-04-11 23:24:31 +00:00 committed by GitHub
commit 7cb4f741e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/dev-build-images.sh
View File

@ -5,12 +5,8 @@ if [ $# -eq 1 ]; then
REPO=$1 REPO=$1
fi fi
SBT_VERSION=$(grep sbt.version ../project/build.properties) SBT_VERSION=$(grep sbt.version ../project/build.properties|cut -d'=' -f2|xargs)
SBT_VERSION=${SBT_VERSION:12:99} VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
TMP_VERSION=$(cat ../version.sbt)
TMP_VERSION=${TMP_VERSION:25:99}
VERSION=${TMP_VERSION%\"}
if [[ $VERSION == *"SNAPSHOT" ]]; then if [[ $VERSION == *"SNAPSHOT" ]]; then
VERSION=SNAPSHOT VERSION=SNAPSHOT

4
docker/dev-push-images.sh
View File

@ -5,9 +5,7 @@ if [ $# -eq 1 ]; then
REPO=$1 REPO=$1
fi fi
TMP_VERSION=$(cat ../version.sbt) VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
TMP_VERSION=${TMP_VERSION:25:99}
VERSION=${TMP_VERSION%\"}
if [[ $VERSION == *"SNAPSHOT" ]]; then if [[ $VERSION == *"SNAPSHOT" ]]; then
VERSION=SNAPSHOT VERSION=SNAPSHOT

4
docker/hooks/build
View File

@ -15,9 +15,7 @@ echo "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
# verify that version.sbt and tag match for non-snapshot (ENV variable DOCKER_VERIFY_TAG must be set to 1) # verify that version.sbt and tag match for non-snapshot (ENV variable DOCKER_VERIFY_TAG must be set to 1)
if [ $DOCKER_VERIFY_TAG -eq 1 ] && [[ "$DOCKER_TAG" != *"-SNAPSHOT" ]]; then if [ $DOCKER_VERIFY_TAG -eq 1 ] && [[ "$DOCKER_TAG" != *"-SNAPSHOT" ]]; then
echo validating version number... echo validating version number...
TMP_VERSION=$(cat ../version.sbt) VERSION=$(cat ../version.sbt | cut -d'=' -f2 | tr -d '"'|xargs)
TMP_VERSION=${TMP_VERSION:25:99}
VERSION=${TMP_VERSION%\"}
if [ "$DOCKER_TAG" != "base-v$VERSION" ]; then if [ "$DOCKER_TAG" != "base-v$VERSION" ]; then
echo "version number mismatch (Docker/Tag: $DOCKER_TAG, Project: $VERSION), aborting!" echo "version number mismatch (Docker/Tag: $DOCKER_TAG, Project: $VERSION), aborting!"
exit 1 exit 1