Compare commits
2
Commits
1aa87f33c4
...
fc0b380b35
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc0b380b35 | ||
|
|
23e3c6a990 |
No files matched your search
@@ -1,3 +1,4 @@
|
|||||||
node_modules
|
node_modules
|
||||||
public/node_modules
|
public/node_modules
|
||||||
public/dist
|
public/dist
|
||||||
|
private/minis-backend/build
|
||||||
@@ -3,3 +3,6 @@
|
|||||||
node_modules
|
node_modules
|
||||||
package-lock.json
|
package-lock.json
|
||||||
/.idea/
|
/.idea/
|
||||||
|
|
||||||
|
.env
|
||||||
|
!.env.example
|
||||||
+2
-3
@@ -16,14 +16,13 @@ RUN npm install
|
|||||||
RUN npm run build-only
|
RUN npm run build-only
|
||||||
|
|
||||||
|
|
||||||
FROM amazoncorretto:18 as miniplan
|
FROM amazoncorretto:21 as miniplan
|
||||||
LABEL authors="walamana"
|
LABEL authors="walamana"
|
||||||
|
|
||||||
RUN mkdir -p /app/public
|
RUN mkdir -p /app/public
|
||||||
COPY --from=build_backend /home/gradle/src/build/libs/*.jar /app/backend.jar
|
COPY --from=build_backend /home/gradle/src/build/libs/*.jar /app/backend.jar
|
||||||
COPY --from=build_frontend /home/node/app/dist /app/public
|
COPY --from=build_frontend /home/node/app/dist /app/public
|
||||||
COPY /private/minis-backend/application_docker.conf /app/application.conf
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENTRYPOINT ["java", "-jar", "backend.jar", "-config=application.conf"]
|
ENTRYPOINT ["java", "-jar", "backend.jar"]
|
||||||
@@ -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
|
|
||||||
|
|
||||||
@@ -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
|
||||||
@@ -39,3 +39,4 @@ out/
|
|||||||
|
|
||||||
local/
|
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}"
|
|
||||||
}
|
|
||||||
@@ -5,9 +5,9 @@ val logback_version: String by project
|
|||||||
val exposed_version: String by project
|
val exposed_version: String by project
|
||||||
val h2_version: String by project
|
val h2_version: String by project
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "2.3.21"
|
kotlin("jvm") version "2.4.10"
|
||||||
id("io.ktor.plugin") version "3.5.1"
|
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"
|
id("com.palantir.docker") version "0.36.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,9 +35,10 @@ fun Application.module() {
|
|||||||
configureSerialization()
|
configureSerialization()
|
||||||
configureDatabases()
|
configureDatabases()
|
||||||
|
|
||||||
|
val frontendPath = environment.config.property("frontend.path").getString()
|
||||||
routing {
|
routing {
|
||||||
singlePageApplication {
|
singlePageApplication {
|
||||||
vue(System.getenv("FRONTEND_PATH") ?: "")
|
vue(frontendPath)
|
||||||
}
|
}
|
||||||
route("/api") {
|
route("/api") {
|
||||||
configureMinistrantenRoutes()
|
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}
|
||||||
|
}
|
||||||
@@ -13,9 +13,9 @@ const router = createRouter({
|
|||||||
{
|
{
|
||||||
path: "/",
|
path: "/",
|
||||||
name: "home-redirect",
|
name: "home-redirect",
|
||||||
component: null,
|
component: HomeView,
|
||||||
beforeEnter: async (to, from) => {
|
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)
|
.sort((a, b) => a.id - b.id)
|
||||||
return {
|
return {
|
||||||
name: "home",
|
name: "home",
|
||||||
|
|||||||
Reference in new issue
Block a user