Env-based config, Java 21 / Kotlin 2.4.10 upgrade #10

Merged
walamana merged 2 commits from chore/java21-kotlin-2.4 into main 2026-11-19 16:48:57 +01:00
10 changed files with 71 additions and 101 deletions
Showing only changes of commit 23e3c6a990 - Show all commits

No files matched your search

+3
View File
@@ -3,3 +3,6 @@
node_modules
package-lock.json
/.idea/
.env
!.env.example
+1 -2
View File
@@ -22,8 +22,7 @@ LABEL authors="walamana"
RUN mkdir -p /app/public
COPY --from=build_backend /home/gradle/src/build/libs/*.jar /app/backend.jar
COPY --from=build_frontend /home/node/app/dist /app/public
COPY /private/minis-backend/application_docker.conf /app/application.conf
WORKDIR /app
ENTRYPOINT ["java", "-jar", "backend.jar", "-config=application.conf"]
ENTRYPOINT ["java", "-jar", "backend.jar"]
-15
View File
@@ -1,15 +0,0 @@
KTOR_DEPLOYMENT_PORT=8080
KTOR_DEVELOPMENT=false
JWT_SECRET=def
JWT_ISSUER=localhost
JWT_AUDIENCE=localhost
JWT_REALM=miniplan
DATABASE_URL=jdbc:h2:file:./db
DATABASE_DRIVER=org.h2.Driver
DATABASE_USER=abc
DATABASE_PASSWORD=abc
ADMIN_PASSWORD=123
FRONTEND_PATH=./public
APPLICATION_NAME=Miniplan\ Hl.\ Familie
PORT=8080
+20
View File
@@ -0,0 +1,20 @@
# Copy to .env and fill in. Loaded by dotenv when running locally; in Docker
# the same variables are set by docker-compose. Defaults are in
# src/main/resources/application.conf; only JWT_SECRET and ADMIN_PASSWORD are required.
JWT_SECRET=change-me
ADMIN_PASSWORD=change-me
KTOR_DEVELOPMENT=true
#KTOR_DEPLOYMENT_PORT=8080
#JWT_ISSUER=http://0.0.0.0:8080/
#JWT_AUDIENCE=http://0.0.0.0:8080/
#JWT_REALM=mini-data
#DATABASE_URL=jdbc:postgresql://localhost:5432/minis
#DATABASE_DRIVER=org.postgresql.Driver
#DATABASE_USER=minis
#DATABASE_PASSWORD=minis
#FRONTEND_PATH=../../public/dist
+2 -1
View File
@@ -38,4 +38,5 @@ out/
.env
local/
db.mv.db
db.mv.db
/db.trace.db
@@ -1,25 +0,0 @@
ktor {
development = true
deployment {
port = ${PORT}
}
application {
modules = [ de.walamana.ApplicationKt.module ]
}
}
jwt {
secret = ${SECRET}
issuer = "http://0.0.0.0:8080/"
audience = "http://0.0.0.0:8080/"
realm = "mini-data"
}
database {
url = "jdbc:h2:file:./db"
driver = "org.h2.Driver"
}
admin {
password = ${ADMIN}
}
@@ -1,27 +0,0 @@
ktor {
development = ${KTOR_DEVELOPMENT}
deployment {
port = ${KTOR_DEPLOYMENT_PORT}
}
application {
modules = [ de.walamana.ApplicationKt.module ]
}
}
jwt {
secret = ${JWT_SECRET}
issuer = ${JWT_ISSUER}
audience = ${JWT_AUDIENCE}
realm = ${JWT_REALM}
}
database {
url = ${DATABASE_URL}
driver = ${DATABASE_DRIVER}
user = ${DATABASE_USER}
password = ${DATABASE_PASSWORD}
}
admin {
password = ${ADMIN_PASSWORD}
}
@@ -1,30 +0,0 @@
ktor {
deployment {
port = ${KTOR_DEPLOYMENT_PORT}
}
application {
modules = [ de.walamana.ApplicationKt.module ]
}
}
jwt {
secret = "${JWT_SECRET}"
issuer = "${JWT_ISSUER}"
audience = "${JWT_AUDIENCE}"
realm = "${JWT_REALM}"
}
database {
url = "jdbc:postgresql://localhost:5432/miniplan"
driver = "org.postgresql.Driver"
user = "miniplan"
password = "${DB_PASSWORD}"
}
admin {
password = "${ADMIN}"
}
application {
name = "${APPLICATION_NAME}"
}
@@ -35,9 +35,10 @@ fun Application.module() {
configureSerialization()
configureDatabases()
val frontendPath = environment.config.property("frontend.path").getString()
routing {
singlePageApplication {
vue(System.getenv("FRONTEND_PATH") ?: "")
vue(frontendPath)
}
route("/api") {
configureMinistrantenRoutes()
@@ -0,0 +1,43 @@
# Defaults live here; every value can be overridden by the environment variable
# on the line below it (`${?VAR}` only applies when VAR is set).
# Values without a default (JWT_SECRET, ADMIN_PASSWORD) must be provided.
ktor {
development = false
development = ${?KTOR_DEVELOPMENT}
deployment {
port = 8080
port = ${?KTOR_DEPLOYMENT_PORT}
}
application {
modules = [ de.walamana.ApplicationKt.module ]
}
}
jwt {
secret = ${JWT_SECRET}
issuer = "http://0.0.0.0:8080/"
issuer = ${?JWT_ISSUER}
audience = "http://0.0.0.0:8080/"
audience = ${?JWT_AUDIENCE}
realm = "mini-data"
realm = ${?JWT_REALM}
}
database {
url = "jdbc:h2:file:./db"
url = ${?DATABASE_URL}
driver = "org.h2.Driver"
driver = ${?DATABASE_DRIVER}
user = ${?DATABASE_USER}
password = ${?DATABASE_PASSWORD}
}
admin {
password = ${ADMIN_PASSWORD}
}
frontend {
path = ""
path = ${?FRONTEND_PATH}
}