tpeetz/kontor
1
0
Fork 0
Code Issues 7 Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

change to version 0.4.0-SNAPSHOT
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 3s
Details

Browse Source
This commit is contained in:
Thomas Peetz
2026-08-25 11:11:51 +02:00
parent a113f08ddc
commit bda453a92a
24 changed files with 418 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy-kontor.sh
+1 -1
View File
@@ -4,7 +4,7 @@ NEXUS_URL=https://nexus.thpeetz.de
MAVEN_REPO=maven-snapshots MAVEN_REPO=maven-snapshots
GROUP_ID=de.thpeetz GROUP_ID=de.thpeetz
ARTIFACT_ID=kontor-spring ARTIFACT_ID=kontor-spring
VERSION=0.3.0 VERSION=0.4.0
FILE_EXTENSION=jar FILE_EXTENSION=jar
download_url=$(curl -X GET "${NEXUS_URL}/service/rest/v1/search/assets?repository=${MAVEN_REPO}&maven.groupId=${GROUP_ID}&maven.artifactId=${ARTIFACT_ID}&maven.baseVersion=${VERSION}&maven.extension=${FILE_EXTENSION}" -H "accept: application/json" | jq -rc '.items | .[].downloadUrl' | sort | tail -n 1) download_url=$(curl -X GET "${NEXUS_URL}/service/rest/v1/search/assets?repository=${MAVEN_REPO}&maven.groupId=${GROUP_ID}&maven.artifactId=${ARTIFACT_ID}&maven.baseVersion=${VERSION}&maven.extension=${FILE_EXTENSION}" -H "accept: application/json" | jq -rc '.items | .[].downloadUrl' | sort | tail -n 1)
kontor-api/pyproject.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "kontor-api" name = "kontor-api"
version = "0.1.0" version = "0.4.0"
description = "Add your description here" description = "Add your description here"
readme = "README.md" readme = "README.md"
requires-python = ">=3.13" requires-python = ">=3.13"
kontor-api/src/core/config.py
+8 -4
View File
@@ -9,17 +9,21 @@ load_dotenv(dotenv_path=env_path)
class Settings: class Settings:
PROJECT_NAME: str = "Kontor" PROJECT_NAME: str = "Kontor"
PROJECT_VERSION: str = "0.3.0" PROJECT_VERSION: str = "0.4.0"
DB_USER: str = os.getenv("DB_USER", "kontor") DB_USER: str = os.getenv("DB_USER", "kontor")
DB_PASSWORD: str = os.getenv("DB_PASSWORD", "kontor") DB_PASSWORD: str = os.getenv("DB_PASSWORD", "kontor")
DB_SERVER: str = os.getenv("DB_SERVER", "postgres") DB_SERVER: str = os.getenv("DB_SERVER", "postgres")
DB_PORT: int = int(os.getenv("DB_PORT", 5432)) DB_PORT: int = int(os.getenv("DB_PORT", 5432))
DB_DBNAME: str = os.getenv("DB_DBNAME", "kontor") DB_DBNAME: str = os.getenv("DB_DBNAME", "kontor")
DATABASE_URL: str = f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_SERVER}:{DB_PORT}/{DB_DBNAME}" DATABASE_URL: str = (
SECRET_KEY: str = os.getenv("SECRET_KEY", "J6GOtcwC2NJI1l0VkHu20PacPFGTxpirBxWwynoHjsc=") f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_SERVER}:{DB_PORT}/{DB_DBNAME}"
)
SECRET_KEY: str = os.getenv(
"SECRET_KEY", "J6GOtcwC2NJI1l0VkHu20PacPFGTxpirBxWwynoHjsc="
)
ALGORITHM = "HS256" ALGORITHM = "HS256"
ACCESS_TOKEN_EXPIRE_MINUTES = 60 * 24 * 7 # one week in mins ACCESS_TOKEN_EXPIRE_MINUTES = 60 * 24 * 7 # one week in mins
settings = Settings()
settings = Settings()
kontor-doc/gradle.properties
+1 -1
View File
@@ -1,7 +1,7 @@
# This file was generated by the Gradle 'init' task. # This file was generated by the Gradle 'init' task.
# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties # https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
description='Kontor Documentation' description='Kontor Documentation'
version=0.3.0 version=0.4.0-SNAPSHOT
group=de.thpeetz group=de.thpeetz
org.gradle.configuration-cache=true org.gradle.configuration-cache=true
kontor-model/pyproject.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "kontor_model" name = "kontor_model"
version = "0.3.0" version = "0.4.0"
description = "Kontor Model" description = "Kontor Model"
readme = "README.md" readme = "README.md"
authors = [ authors = [
kontor-quarkus/src/main/kotlin/de/thpeetz/kontor/KontorApplication.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import org.eclipse.microprofile.openapi.annotations.tags.Tag
@OpenAPIDefinition( @OpenAPIDefinition(
info = Info( info = Info(
title = "Kontor", title = "Kontor",
version = "0.3.0" version = "0.4.0-SNAPSHOT"
) )
) )
class KontorApplication: Application() class KontorApplication: Application()
kontor-robyn/pyproject.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[project] [project]
name = "kontor-robyn" name = "kontor-robyn"
version = "0.1.0" version = "0.4.0"
description = "Add your description here" description = "Add your description here"
readme = "README.md" readme = "README.md"
authors = [ authors = [
kontor-scripts/pyproject.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[project] [project]
requires-python = ">=3.13" requires-python = ">=3.13"
name = "kontor-scripts" name = "kontor-scripts"
version = "0.1.0" version = "0.4.0"
readme = "README.md" readme = "README.md"
authors = [ authors = [
{name = "Thomas Peetz", email = "thomas.peetz@thpeetz.de"} {name = "Thomas Peetz", email = "thomas.peetz@thpeetz.de"}
kontor-scripts/uv.lock
Generated
+336 -338
View File
File diff suppressed because it is too large Load Diff
kontor-spring/Containerfile
+1 -1
View File
@@ -14,7 +14,7 @@ FROM docker.io/alpine/java:21-jdk AS run
RUN mkdir -p /logs RUN mkdir -p /logs
COPY --from=builder /build/libs/kontor-spring-0.3.0.jar app.jar COPY --from=builder /build/libs/kontor-spring-0.4.0-SNAPSHOT.jar app.jar
EXPOSE 8100 EXPOSE 8100
kontor-spring/Containerfile.local
+1 -1
View File
@@ -2,7 +2,7 @@ FROM docker.io/alpine/java:21-jdk AS run
RUN mkdir -p /logs RUN mkdir -p /logs
COPY ./build/libs/kontor-spring-0.3.0.jar app.jar COPY ./build/libs/kontor-spring-0.4.0-SNAPSHOT.jar app.jar
EXPOSE 8100 EXPOSE 8100
kontor-spring/gradle.properties
+1 -1
View File
@@ -1,5 +1,5 @@
description='Kontor with Spring Boot' description='Kontor with Spring Boot'
version=0.3.0 version=0.4.0-SNAPSHOT
group=de.thpeetz group=de.thpeetz
nexusUser=kontor nexusUser=kontor
nexusPassword=kontorNexus nexusPassword=kontorNexus
script/cibuild
+23 -17
View File
@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# script/cibuild: # script/cibuild:
@@ -6,20 +6,26 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
echo " => Baue Image localhost/kontor-spring:0.3.0" . ./version
buildah build -t kontor-spring:0.3.0 kontor-spring
echo " => Baue Image localhost/kontor-api:0.3.0" echo " => Baue Image localhost/kontor-spring:$kontorVersion"
buildah build --volume /home/tpeetz/projects/kontor/kontor-model:/container/kontor-model -t kontor-api:0.3.0 kontor-api #buildah build -t kontor-spring:$kontorVersion kontor-spring
echo " => Baue Image localhost/kontor-quarkus:0.3.0" cd kontor-spring
buildah build -t kontor-quarkus:0.3.0 kontor-quarkus ./gradlew bootJar
echo " => Baue Image localhost/kontor-echo:0.3.0" cd ..
buildah build -t kontor-echo:0.3.0 kontor-echo buildah build -f Containerfile.local -t kontor-spring:$kontorVersion kontor-spring
echo " => Baue Image localhost/kontor-fiber:0.3.0" echo " => Baue Image localhost/kontor-api:$kontorVersion"
buildah build -t kontor-fiber:0.3.0 kontor-fiber buildah build --volume /home/tpeetz/projects/kontor/kontor-model:/container/kontor-model -t kontor-api:$kontorVersion kontor-api
echo " => Baue Image localhost/kontor-javalin:0.3.0" echo " => Baue Image localhost/kontor-quarkus:$kontorVersion"
buildah build -t kontor-javalin:0.3.0 kontor-javalin buildah build -t kontor-quarkus:$kontorVersion kontor-quarkus
echo " => Baue Image localhost/kontor-vue:0.3.0" echo " => Baue Image localhost/kontor-echo:$kontorVersion"
buildah build -t kontor-vue:0.3.0 kontor-vue buildah build -t kontor-echo:$kontorVersion kontor-echo
echo " => Baue Image localhost/kontor-angular:0.3.0" echo " => Baue Image localhost/kontor-fiber:$kontorVersion"
buildah build -t kontor-angular:0.3.0 kontor-angular buildah build -t kontor-fiber:$kontorVersion kontor-fiber
echo " => Baue Image localhost/kontor-javalin:$kontorVersion"
buildah build -t kontor-javalin:$kontorVersion kontor-javalin
echo " => Baue Image localhost/kontor-vue:$kontorVersion"
buildah build -t kontor-vue:$kontorVersion kontor-vue
echo " => Baue Image localhost/kontor-angular:$kontorVersion"
buildah build -t kontor-angular:$kontorVersion kontor-angular
script/setup
+27 -25
View File
@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# script/setup: Set up container for the first time after cloning # script/setup: Set up container for the first time after cloning
@@ -6,6 +6,8 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
source version
script/bootstrap script/bootstrap
#script/cibuild #script/cibuild
@@ -91,8 +93,8 @@ else
fi fi
echo "==> Setting up container kontor-spring" echo "==> Setting up container kontor-spring"
if podman image exists localhost/kontor-spring:0.3.0; then if podman image exists localhost/kontor-spring:i$kontorVersion; then
echo " => Image localhost/kontor-spring:0.3.0 available" echo " => Image localhost/kontor-spring:$kontorVersion available"
fi fi
if podman container exists kontor-spring; then if podman container exists kontor-spring; then
if podman ps -q --filter "name=kontor-spring"; then if podman ps -q --filter "name=kontor-spring"; then
@@ -105,12 +107,12 @@ else
--name kontor-spring \ --name kontor-spring \
--label "io.containers.autoupdate=local" \ --label "io.containers.autoupdate=local" \
--label "PODMAN_SYSTEMD_UNIT=container-kontor-spring.service" \ --label "PODMAN_SYSTEMD_UNIT=container-kontor-spring.service" \
localhost/kontor-spring:0.3.0 localhost/kontor-spring:$kontorVersion
fi fi
echo "==> Setting up container kontor-api" echo "==> Setting up container kontor-api"
if podman image exists localhost/kontor-api:0.3.0; then if podman image exists localhost/kontor-api:$kontorVersion; then
echo " => Image localhost/kontor-api:0.3.0 available" echo " => Image localhost/kontor-api:$kontorVersion available"
fi fi
if podman container exists kontor-api; then if podman container exists kontor-api; then
if podman ps -q --filter "name=kontor-api"; then if podman ps -q --filter "name=kontor-api"; then
@@ -127,12 +129,12 @@ else
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-api:0.3.0 localhost/kontor-api:$kontorVersion
fi fi
echo "==> Setting up container kontor-quarkus" echo "==> Setting up container kontor-quarkus"
if podman image exists localhost/kontor-quarkus:0.3.0; then if podman image exists localhost/kontor-quarkus:$kontorVersion; then
echo " => Image localhost/kontor-quarkus:0.3.0 available" echo " => Image localhost/kontor-quarkus:$kontorVersion available"
fi fi
if podman container exists kontor-quarkus; then if podman container exists kontor-quarkus; then
if podman ps -q --filter "name=kontor-quarkus"; then if podman ps -q --filter "name=kontor-quarkus"; then
@@ -149,12 +151,12 @@ else
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-quarkus:0.3.0 localhost/kontor-quarkus:$kontorVersion
fi fi
echo "==> Setting up container kontor-echo" echo "==> Setting up container kontor-echo"
if podman image exists localhost/kontor-echo:0.3.0; then if podman image exists localhost/kontor-echo:$kontorVersion; then
echo " => Image localhost/kontor-echo:0.3.0 available" echo " => Image localhost/kontor-echo:$kontorVersion available"
fi fi
if podman container exists kontor-echo; then if podman container exists kontor-echo; then
if podman ps -q --filter "name=kontor-echo"; then if podman ps -q --filter "name=kontor-echo"; then
@@ -171,12 +173,12 @@ else
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-echo:0.3.0 localhost/kontor-echo:$kontorVersion
fi fi
echo "==> Setting up container kontor-fiber" echo "==> Setting up container kontor-fiber"
if podman image exists localhost/kontor-fiber:0.3.0; then if podman image exists localhost/kontor-fiber:$kontorVersion; then
echo " => Image localhost/kontor-fiber:0.3.0 available" echo " => Image localhost/kontor-fiber:$kontorVersion available"
fi fi
if podman container exists kontor-fiber; then if podman container exists kontor-fiber; then
if podman ps -q --filter "name=kontor-fiber"; then if podman ps -q --filter "name=kontor-fiber"; then
@@ -193,12 +195,12 @@ else
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-fiber:0.3.0 localhost/kontor-fiber:$kontorVersion
fi fi
echo "==> Setting up container kontor-javalin" echo "==> Setting up container kontor-javalin"
if podman image exists localhost/kontor-javalin:0.3.0; then if podman image exists localhost/kontor-javalin:$kontorVersion; then
echo " => Image localhost/kontor-javalin:0.3.0 available" echo " => Image localhost/kontor-javalin:$kontorVersion available"
fi fi
if podman container exists kontor-javalin; then if podman container exists kontor-javalin; then
if podman ps -q --filter "name=kontor-javalin"; then if podman ps -q --filter "name=kontor-javalin"; then
@@ -215,12 +217,12 @@ else
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-javalin:0.3.0 localhost/kontor-javalin:$kontorVersion
fi fi
echo "==> Setting up container kontor-vue" echo "==> Setting up container kontor-vue"
if podman image exists localhost/kontor-vue:0.3.0; then if podman image exists localhost/kontor-vue:$kontorVersion; then
echo " => Image localhost/kontor-vue:0.3.0 available" echo " => Image localhost/kontor-vue:$kontorVersion available"
fi fi
if podman container exists kontor-vue; then if podman container exists kontor-vue; then
if podman ps -q --filter "name=kontor-vue"; then if podman ps -q --filter "name=kontor-vue"; then
@@ -233,12 +235,12 @@ else
--name kontor-vue \ --name kontor-vue \
--label "io.containers.autoupdate=local" \ --label "io.containers.autoupdate=local" \
--label "PODMAN_SYSTEMD_UNIT=container-kontor-vue.service" \ --label "PODMAN_SYSTEMD_UNIT=container-kontor-vue.service" \
localhost/kontor-vue:0.3.0 localhost/kontor-vue:$kontorVersion
fi fi
echo "==> Setting up container kontor-angular" echo "==> Setting up container kontor-angular"
if podman image exists localhost/kontor-angular:0.3.0; then if podman image exists localhost/kontor-angular:$kontorVersion; then
echo " => Image localhost/kontor-angular:0.3.0 available" echo " => Image localhost/kontor-angular:$kontorVersion available"
fi fi
if podman container exists kontor-angular; then if podman container exists kontor-angular; then
if podman ps -q --filter "name=kontor-angular"; then if podman ps -q --filter "name=kontor-angular"; then
@@ -251,6 +253,6 @@ else
--name kontor-angular \ --name kontor-angular \
--label "io.containers.autoupdate=local" \ --label "io.containers.autoupdate=local" \
--label "PODMAN_SYSTEMD_UNIT=container-kontor-angular.service" \ --label "PODMAN_SYSTEMD_UNIT=container-kontor-angular.service" \
localhost/kontor-angular:0.3.0 localhost/kontor-angular:$kontorVersion
fi fi
script/update
+3 -1
View File
@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# script/update: # script/update:
@@ -6,6 +6,8 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
source version
echo "==> Stopping and removing pod kontor" echo "==> Stopping and removing pod kontor"
if podman pod exists kontor; then if podman pod exists kontor; then
podman pod stop kontor podman pod stop kontor
service/container/kontor-angular.service
+1 -1
View File
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/podman run \
--name kontor-angular \ --name kontor-angular \
--label io.containers.autoupdate=local \ --label io.containers.autoupdate=local \
--label PODMAN_SYSTEMD_UNIT=kontor-angular.service \ --label PODMAN_SYSTEMD_UNIT=kontor-angular.service \
localhost/kontor-angular:0.3.0 localhost/kontor-angular:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-api.service
+1 -1
View File
@@ -29,7 +29,7 @@ ExecStart=/usr/bin/podman run \
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-api:0.3.0 localhost/kontor-api:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-echo.service
+1 -1
View File
@@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run \
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-echo:0.3.0 localhost/kontor-echo:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-fiber.service
+1 -1
View File
@@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run \
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-fiber:0.3.0 localhost/kontor-fiber:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-javalin.service
+1 -1
View File
@@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run \
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-javalin:0.3.0 localhost/kontor-javalin:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-quarkus.service
+1 -1
View File
@@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run \
--health-interval=1s \ --health-interval=1s \
--health-timeout=5s \ --health-timeout=5s \
--health-retries=10 \ --health-retries=10 \
localhost/kontor-quarkus:0.3.0 localhost/kontor-quarkus:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-spring.service
+1 -1
View File
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/podman run \
--name kontor-spring \ --name kontor-spring \
--label io.containers.autoupdate=local \ --label io.containers.autoupdate=local \
--label PODMAN_SYSTEMD_UNIT=kontor-spring.service \ --label PODMAN_SYSTEMD_UNIT=kontor-spring.service \
localhost/kontor-spring:0.3.0 localhost/kontor-spring:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
service/container/kontor-vue.service
+1 -1
View File
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/podman run \
--name kontor-vue \ --name kontor-vue \
--label io.containers.autoupdate=local \ --label io.containers.autoupdate=local \
--label PODMAN_SYSTEMD_UNIT=kontor-vue.service \ --label PODMAN_SYSTEMD_UNIT=kontor-vue.service \
localhost/kontor-vue:0.3.0 localhost/kontor-vue:0.4.0
ExecStop=/usr/bin/podman stop \ ExecStop=/usr/bin/podman stop \
--ignore -t 10 \ --ignore -t 10 \
--cidfile=%t/%n.ctr-id --cidfile=%t/%n.ctr-id
version
+1
View File
@@ -0,0 +1 @@
kontorVersion=0.4.0