From 3017e10e0d0db0edb6b32a22db0a5957692b0161 Mon Sep 17 00:00:00 2001 From: walamana Date: Wed, 7 Aug 2024 20:55:53 +0200 Subject: [PATCH] fix: add postgres driver to implementation --- docker-compose.yml | 39 +++++++++++++++++++++++++- private/minis-backend/build.gradle.kts | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e261f4..fc5b0ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,41 @@ -name: "Miniplan" +name: miniplan + +networks: + db: services: + db: + image: postgres + restart: always + environment: + - POSTGRES_PASSWORD=minis + - POSTGRES_USER=minis + - POSTGRES_DB=minis + networks: + - db + healthcheck: + test: ["CMD-SHELL", "pg_isready", "-d", "db_prod"] + interval: 30s + timeout: 60s + retries: 5 + start_period: 80s app: + image: git.walamana.de/walamana/miniplan + restart: no + depends_on: + - db + environment: + - KTOR_DEPLOYMENT_PORT=8081 + - KTOR_DEVELOPMENT=true + - JWT_SECRET=${JWT_SECRET} + - JWT_ISSUER=${JWT_ISSUER} + - JWT_AUDIENCE=${JWT_AUDIENCE} + - JWT_REALM=${JWT_REALM} + - DATABASE_URL=jdbc:postgresql://localhost:5432/miniplan + - DATABASE_DRIVER=org.postgresql.Driver + - DATABASE_USER=minis + - DATABASE_PASSWORD=minis + - ADMIN_PASSWORD=${ADMIN_PASSWORD} + ports: + - 8081:8081 + diff --git a/private/minis-backend/build.gradle.kts b/private/minis-backend/build.gradle.kts index eb1892b..8fa5431 100644 --- a/private/minis-backend/build.gradle.kts +++ b/private/minis-backend/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("io.ktor:ktor-server-netty-jvm") implementation("ch.qos.logback:logback-classic:$logback_version") -// implementation("org.postgresql:postgresql:42.7.2") + implementation("org.postgresql:postgresql:42.7.2") implementation("com.h2database:h2:$h2_version") implementation("io.github.cdimascio:dotenv-kotlin:6.4.1")