diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/Application.kt b/backend/src/main/kotlin/no/nav/helse/sprik/Application.kt index c6f1928..2ff3f15 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/Application.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/Application.kt @@ -13,9 +13,8 @@ fun main() { class Application(private val db: Database) { fun startBlocking() { - runBlocking { - configureRouting().start(wait = false) + configureRouting().start(wait = true) Runtime.getRuntime().addShutdownHook( Thread { db.dataSource.close() diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/db/Database.kt b/backend/src/main/kotlin/no/nav/helse/sprik/db/Database.kt index 2dff291..e8cd4f6 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/db/Database.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/db/Database.kt @@ -28,8 +28,8 @@ class Database(dbconfig: HikariConfig = dbconfig()) { private fun dbconfig() = HikariConfig().apply { jdbcUrl = DB_URL - username = username - password = password + username = Environment.Database.username + password = Environment.Database.password maximumPoolSize = 1 connectionTimeout = 30.seconds.toJavaDuration().toMillis() initializationFailTimeout = 1.minutes.toJavaDuration().toMillis() @@ -37,8 +37,8 @@ private fun dbconfig() = HikariConfig().apply { private fun migrateconfig() = HikariConfig().apply { jdbcUrl = DB_URL - username = username - password = password + username = Environment.Database.username + password = Environment.Database.password maximumPoolSize = 2 connectionTimeout = 30.seconds.toJavaDuration().toMillis() initializationFailTimeout = 1.minutes.toJavaDuration().toMillis() diff --git a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt index 6e6d0c1..eaf420e 100644 --- a/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt +++ b/backend/src/main/kotlin/no/nav/helse/sprik/plugins/Routing.kt @@ -8,6 +8,7 @@ import io.ktor.server.plugins.contentnegotiation.* import io.ktor.serialization.kotlinx.json.* import io.ktor.server.cio.* import io.ktor.server.engine.* +import io.ktor.server.http.content.* import io.ktor.server.plugins.cors.routing.* import io.ktor.server.request.* import no.nav.helse.sprik.Test @@ -25,9 +26,22 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin json() } routing { + singlePageApplication{ + filesPath = "frontend/.next/server/pages/" + defaultPage = "index.html" + ignoreFiles { + it.endsWith(".txt") + } + } get("/") { call.respondText("Hello World!") } + get("/isalive"){ + call.respondText("ALIVE") + } + get("/isready"){ + call.respondText("READY") + } post("/test") { val test = call.receive() call.respond(status = HttpStatusCode.Created, message = test) @@ -37,9 +51,11 @@ fun configureRouting(): ApplicationEngine = embeddedServer(CIO, applicationEngin println(test) call.respond(status = HttpStatusCode.Created, message = test) } - } } + connector { + port = 8080 + } }) diff --git a/frontend/next.config.js b/frontend/next.config.js index 248c251..7b971ca 100644 --- a/frontend/next.config.js +++ b/frontend/next.config.js @@ -1,7 +1,7 @@ /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, - output: 'standalone', + output: 'export', } module.exports = nextConfig diff --git a/nais.yml b/nais.yml index 5447b30..ba3bbf6 100644 --- a/nais.yml +++ b/nais.yml @@ -8,6 +8,12 @@ metadata: spec: image: {{ image }} port: 8080 + liveness: + path: isalive + initialDelay: 5 + readiness: + path: isready + initialDelay: 5 replicas: min: 1 max: 2 @@ -18,8 +24,6 @@ spec: databases: - name: helse-sprik envVarPrefix: DATABASE - users: - - name: helse-sprik resources: requests: cpu: 100m