diff --git a/.dockerignore b/.dockerignore index 4489d51..54483f6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ node_modules public/node_modules -public/dist \ No newline at end of file +public/dist +private/minis-backend/build diff --git a/.gitignore b/.gitignore index 6cf3e2a..fa5a421 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ node_modules package-lock.json /.idea/ + +.env +!.env.example diff --git a/Dockerfile b/Dockerfile index 4ab48dd..0b4b88f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,14 +16,13 @@ RUN npm install RUN npm run build-only -FROM amazoncorretto:18 as miniplan +FROM amazoncorretto:21 as miniplan 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"] diff --git a/private/minis-backend/.env b/private/minis-backend/.env deleted file mode 100644 index 7a59ace..0000000 --- a/private/minis-backend/.env +++ /dev/null @@ -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 - diff --git a/private/minis-backend/.env.example b/private/minis-backend/.env.example new file mode 100644 index 0000000..3806fd4 --- /dev/null +++ b/private/minis-backend/.env.example @@ -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 diff --git a/private/minis-backend/.gitignore b/private/minis-backend/.gitignore index 6462bce..e3dbdd7 100644 --- a/private/minis-backend/.gitignore +++ b/private/minis-backend/.gitignore @@ -38,4 +38,5 @@ out/ .env local/ -db.mv.db \ No newline at end of file +db.mv.db +/db.trace.db diff --git a/private/minis-backend/application_base.conf b/private/minis-backend/application_base.conf deleted file mode 100644 index 62f770f..0000000 --- a/private/minis-backend/application_base.conf +++ /dev/null @@ -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} -} diff --git a/private/minis-backend/application_docker.conf b/private/minis-backend/application_docker.conf deleted file mode 100644 index a6f0c64..0000000 --- a/private/minis-backend/application_docker.conf +++ /dev/null @@ -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} -} diff --git a/private/minis-backend/application_docker_copy.conf b/private/minis-backend/application_docker_copy.conf deleted file mode 100644 index 196735d..0000000 --- a/private/minis-backend/application_docker_copy.conf +++ /dev/null @@ -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}" -} diff --git a/private/minis-backend/build.gradle.kts b/private/minis-backend/build.gradle.kts index ed561f5..2bb2733 100644 --- a/private/minis-backend/build.gradle.kts +++ b/private/minis-backend/build.gradle.kts @@ -5,9 +5,9 @@ val logback_version: String by project val exposed_version: String by project val h2_version: String by project plugins { - kotlin("jvm") version "2.3.21" + kotlin("jvm") version "2.4.10" id("io.ktor.plugin") version "3.5.1" - kotlin("plugin.serialization") version "2.3.21" + kotlin("plugin.serialization") version "2.4.10" id("com.palantir.docker") version "0.36.0" } diff --git a/private/minis-backend/src/main/kotlin/de/walamana/Application.kt b/private/minis-backend/src/main/kotlin/de/walamana/Application.kt index 7c60aa7..358018c 100644 --- a/private/minis-backend/src/main/kotlin/de/walamana/Application.kt +++ b/private/minis-backend/src/main/kotlin/de/walamana/Application.kt @@ -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() diff --git a/private/minis-backend/src/main/resources/application.conf b/private/minis-backend/src/main/resources/application.conf new file mode 100644 index 0000000..c79010c --- /dev/null +++ b/private/minis-backend/src/main/resources/application.conf @@ -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} +} diff --git a/public/src/router/index.ts b/public/src/router/index.ts index 44bb034..24cab87 100644 --- a/public/src/router/index.ts +++ b/public/src/router/index.ts @@ -13,9 +13,9 @@ const router = createRouter({ { path: "/", name: "home-redirect", - component: null, + component: HomeView, beforeEnter: async (to, from) => { - const groups = (await API.getPlans()) + const groups = (await API.getPlans().then(res => Array.isArray(res) ? res : [])) .sort((a, b) => a.id - b.id) return { name: "home",