TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing typo in version

Browse Source 
This should fix nightly builds. Build script changed to be more compatible.
This commit is contained in:
eikek
2022-01-23 01:06:00 +01:00
parent c1147a4c85
commit 0c56c3b46a
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
docker/dockerfiles/build.sh
View File

@ -35,38 +35,40 @@ trap "{ docker buildx rm docspell-builder; }" EXIT
platforms="linux/amd64,linux/aarch64,linux/arm/v7" platforms="linux/amd64,linux/aarch64,linux/arm/v7"
docker buildx create --name docspell-builder --use docker buildx create --name docspell-builder --use
if [[ $version == *SNAPSHOT* ]]; then case $version in
echo ">>>> Building nightly images for $version <<<<<" *SNAPSHOT)
url_base="https://github.com/eikek/docspell/releases/download/nightly" echo ">>>> Building nightly images for $version <<<<<"
url_base="https://github.com/eikek/docspell/releases/download/nightly"
echo "============ Building Restserver ============" echo "============ Building Restserver ============"
docker buildx build \ docker buildx build \
--platform="$platforms" $push \ --platform="$platforms" $push \
--build-arg restserver_url="$url_base/docspell-restserver-$version.zip" \ --build-arg restserver_url="$url_base/docspell-restserver-$version.zip" \
--tag docspell/restserver:nightly \ --tag docspell/restserver:nightly \
-f restserver.dockerfile . -f restserver.dockerfile .
echo "============ Building Joex ============" echo "============ Building Joex ============"
docker buildx build \ docker buildx build \
--platform="$platforms" $push \ --platform="$platforms" $push \
--build-arg joex_url="$url_base/docspell-joex-$version.zip" \ --build-arg joex_url="$url_base/docspell-joex-$version.zip" \
--tag docspell/joex:nightly \ --tag docspell/joex:nightly \
-f joex.dockerfile . -f joex.dockerfile .
else ;;
echo ">>>> Building release images for $version <<<<<" *)
echo "============ Building Restserver ============" echo ">>>> Building release images for $version <<<<<"
docker buildx build \ echo "============ Building Restserver ============"
--platform="$platforms" $push \ docker buildx build \
--build-arg version=$version \ --platform="$platforms" $push \
--tag docspell/restserver:v$version \ --build-arg version=$version \
--tag docspell/restserver:latest \ --tag docspell/restserver:v$version \
-f restserver.dockerfile . --tag docspell/restserver:latest \
-f restserver.dockerfile .
echo "============ Building Joex ============" echo "============ Building Joex ============"
docker buildx build \ docker buildx build \
--platform="$platforms" $push \ --platform="$platforms" $push \
--build-arg version=$version \ --build-arg version=$version \
--tag docspell/joex:v$version \ --tag docspell/joex:v$version \
--tag docspell/joex:latest \ --tag docspell/joex:latest \
-f joex.dockerfile . -f joex.dockerfile .
fi esac

2
modules/joexapi/src/main/resources/joex-openapi.yml
View File

@ -2,7 +2,7 @@ openapi: 3.0.0
info: info:
title: Docspell JOEX title: Docspell JOEX
version: 0.32.0-SNAPHSOT version: 0.32.0-SNAPSHOT
description: | description: |
This is the remote API to the job executor component of Docspell. This is the remote API to the job executor component of Docspell.
Docspell is a free document management system focused on small Docspell is a free document management system focused on small

2
modules/restapi/src/main/resources/docspell-openapi.yml
View File

@ -2,7 +2,7 @@ openapi: 3.0.0
info: info:
title: Docspell title: Docspell
version: 0.32.0-SNAPHSOT version: 0.32.0-SNAPSHOT
description: | description: |
This is the remote API to Docspell. Docspell is a free document This is the remote API to Docspell. Docspell is a free document
management system focused on small groups or families. management system focused on small groups or families.

2
version.sbt
View File

@ -1 +1 @@
ThisBuild / version := "0.32.0-SNAPHSOT" ThisBuild / version := "0.32.0-SNAPSHOT"

2
website/site/config.toml
View File

@ -26,4 +26,4 @@ skip_anchor_prefixes = [
[extra] [extra]
# Put all your custom variables here # Put all your custom variables here
version = "0.32.0-SNAPHSOT" version = "0.32.0-SNAPSHOT"