diff --git a/docker/dockerfiles/build.sh b/docker/dockerfiles/build.sh index 537cdf5e..96d7bf2a 100755 --- a/docker/dockerfiles/build.sh +++ b/docker/dockerfiles/build.sh @@ -35,38 +35,40 @@ trap "{ docker buildx rm docspell-builder; }" EXIT platforms="linux/amd64,linux/aarch64,linux/arm/v7" docker buildx create --name docspell-builder --use -if [[ $version == *SNAPSHOT* ]]; then - echo ">>>> Building nightly images for $version <<<<<" - url_base="https://github.com/eikek/docspell/releases/download/nightly" +case $version in + *SNAPSHOT) + echo ">>>> Building nightly images for $version <<<<<" + url_base="https://github.com/eikek/docspell/releases/download/nightly" - echo "============ Building Restserver ============" - docker buildx build \ - --platform="$platforms" $push \ - --build-arg restserver_url="$url_base/docspell-restserver-$version.zip" \ - --tag docspell/restserver:nightly \ - -f restserver.dockerfile . + echo "============ Building Restserver ============" + docker buildx build \ + --platform="$platforms" $push \ + --build-arg restserver_url="$url_base/docspell-restserver-$version.zip" \ + --tag docspell/restserver:nightly \ + -f restserver.dockerfile . - echo "============ Building Joex ============" - docker buildx build \ - --platform="$platforms" $push \ - --build-arg joex_url="$url_base/docspell-joex-$version.zip" \ - --tag docspell/joex:nightly \ - -f joex.dockerfile . -else - echo ">>>> Building release images for $version <<<<<" - echo "============ Building Restserver ============" - docker buildx build \ - --platform="$platforms" $push \ - --build-arg version=$version \ - --tag docspell/restserver:v$version \ - --tag docspell/restserver:latest \ - -f restserver.dockerfile . + echo "============ Building Joex ============" + docker buildx build \ + --platform="$platforms" $push \ + --build-arg joex_url="$url_base/docspell-joex-$version.zip" \ + --tag docspell/joex:nightly \ + -f joex.dockerfile . + ;; + *) + echo ">>>> Building release images for $version <<<<<" + echo "============ Building Restserver ============" + docker buildx build \ + --platform="$platforms" $push \ + --build-arg version=$version \ + --tag docspell/restserver:v$version \ + --tag docspell/restserver:latest \ + -f restserver.dockerfile . - echo "============ Building Joex ============" - docker buildx build \ - --platform="$platforms" $push \ - --build-arg version=$version \ - --tag docspell/joex:v$version \ - --tag docspell/joex:latest \ - -f joex.dockerfile . -fi + echo "============ Building Joex ============" + docker buildx build \ + --platform="$platforms" $push \ + --build-arg version=$version \ + --tag docspell/joex:v$version \ + --tag docspell/joex:latest \ + -f joex.dockerfile . +esac diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index 8834778b..1d8c4f03 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.32.0-SNAPHSOT + version: 0.32.0-SNAPSHOT description: | This is the remote API to the job executor component of Docspell. Docspell is a free document management system focused on small diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index 52180b9f..a57308bd 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.32.0-SNAPHSOT + version: 0.32.0-SNAPSHOT description: | This is the remote API to Docspell. Docspell is a free document management system focused on small groups or families. diff --git a/version.sbt b/version.sbt index 6811587c..2d46ef08 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.32.0-SNAPHSOT" +ThisBuild / version := "0.32.0-SNAPSHOT" diff --git a/website/site/config.toml b/website/site/config.toml index 053ef98b..5d9969c9 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.32.0-SNAPHSOT" +version = "0.32.0-SNAPSHOT"