From 0b51038941b969d555309cf5234893c9471e9322 Mon Sep 17 00:00:00 2001 From: PhilKes Date: Tue, 13 Feb 2024 12:34:47 +0100 Subject: [PATCH] feat: Replace Postgresql DB with H2 in-memory for Azure deployment --- docker-compose-dev.yml | 22 +++++++------- docker-compose-fullstack.yml | 30 +++++++++---------- movieland-backend/pom.xml | 10 +++---- .../src/main/resources/application.yml | 13 ++++---- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 2f0f870..a2005a8 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -27,17 +27,17 @@ services: PORT: 4000 network_mode: host # Database Service (Postgresql) - movieland-db: - container_name: movieland-db - image: 'postgres:13.1-alpine' - ports: - - "5432:5432" - environment: - - POSTGRES_USER=movielandadmin - - POSTGRES_PASSWORD=movielandadmin - - POSTGRES_DB=movieland_db - volumes: - - db-data:/var/lib/postgresql/data +# movieland-db: +# container_name: movieland-db +# image: 'postgres:13.1-alpine' +# ports: +# - "5432:5432" +# environment: +# - POSTGRES_USER=movielandadmin +# - POSTGRES_PASSWORD=movielandadmin +# - POSTGRES_DB=movieland_db +# volumes: +# - db-data:/var/lib/postgresql/data movieland-prometheus: diff --git a/docker-compose-fullstack.yml b/docker-compose-fullstack.yml index bd17a12..e15dd2c 100644 --- a/docker-compose-fullstack.yml +++ b/docker-compose-fullstack.yml @@ -7,8 +7,8 @@ services: image: philkes/movie-land-backend:master ports: - "8080:8080" - depends_on: - - movieland-db +# depends_on: +# - movieland-db environment: # Pass environment variables to the service SPRING_DATASOURCE_URL: jdbc:postgresql://movieland-db:5432/movieland_db?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin SPRING_DATASOURCE_USERNAME: movielandadmin @@ -37,19 +37,19 @@ services: networks: - frontend # Database Service (Postgresql) - movieland-db: - container_name: movieland-db - image: 'postgres:13.1-alpine' - ports: - - "5432:5432" - environment: - - POSTGRES_USER=movielandadmin - - POSTGRES_PASSWORD=movielandadmin - - POSTGRES_DB=movieland_db - volumes: - - db-data:/var/lib/postgresql/data - networks: - - backend +# movieland-db: +# container_name: movieland-db +# image: 'postgres:13.1-alpine' +# ports: +# - "5432:5432" +# environment: +# - POSTGRES_USER=movielandadmin +# - POSTGRES_PASSWORD=movielandadmin +# - POSTGRES_DB=movieland_db +# volumes: +# - db-data:/var/lib/postgresql/data +# networks: +# - backend # App backend service movieland-spring-admin: container_name: movieland-spring-admin diff --git a/movieland-backend/pom.xml b/movieland-backend/pom.xml index 68c7813..3b1ad25 100644 --- a/movieland-backend/pom.xml +++ b/movieland-backend/pom.xml @@ -69,6 +69,11 @@ org.springframework.boot spring-boot-starter-actuator + + com.h2database + h2 + runtime + info.movito themoviedbapi @@ -88,11 +93,6 @@ org.springframework.boot spring-boot-starter-jdbc - - org.postgresql - postgresql - runtime - org.springframework.boot spring-boot-starter-security diff --git a/movieland-backend/src/main/resources/application.yml b/movieland-backend/src/main/resources/application.yml index b6aa94d..f0460af 100644 --- a/movieland-backend/src/main/resources/application.yml +++ b/movieland-backend/src/main/resources/application.yml @@ -57,10 +57,10 @@ spring: application: name: MovieLand Backend datasource: - driverClassName: org.postgresql.Driver - password: movielandadmin - username: movielandadmin - url: jdbc:postgresql://localhost:5432/movieland_db + driverClassName: org.h2.Driver + password: sa + username: password + url: jdbc:h2:mem:movieland_db security: user: password: admin @@ -68,10 +68,7 @@ spring: jpa: hibernate: ddl-auto: update - database-platform: org.hibernate.dialect.PostgreSQLDialect - properties: - hibernate: - dialect: org.hibernate.dialect.PostgreSQLDialect + database-platform: org.hibernate.dialect.H2Dialect sql: init: mode: never