From d61c8a5f96aca475b6b5ccc8aedef64614127f7b Mon Sep 17 00:00:00 2001 From: rti Date: Tue, 11 Oct 2022 20:02:45 +0200 Subject: [PATCH] switch to postgres db (#444) --- docker-compose.yml | 19 ++++++++----------- src/main/resources/application.yaml | 11 +++++------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fcf1f2b..0fe0e45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,18 +6,15 @@ services: restart: on-failure ports: - "8080:8080" - hapi-fhir-mysql: - image: mysql:latest - container_name: hapi-fhir-mysql - #https://dev.mysql.com/doc/refman/8.0/en/identifier-case-sensitivity.html - command: --lower_case_table_names=1 + hapi-fhir-postgres: + image: postgres:13-alpine + container_name: hapi-fhir-postgres restart: always environment: - MYSQL_DATABASE: 'hapi' - MYSQL_USER: 'admin' - MYSQL_PASSWORD: 'admin' - MYSQL_ROOT_PASSWORD: 'admin' + POSTGRES_DB: "hapi" + POSTGRES_USER: "admin" + POSTGRES_PASSWORD: "admin" volumes: - - hapi-fhir-mysql:/var/lib/mysql + - hapi-fhir-postgres:/var/lib/postgresql/data volumes: - hapi-fhir-mysql: + hapi-fhir-postgres: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index a651fa9..2d84609 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -14,11 +14,10 @@ spring: check-location: false baselineOnMigrate: true datasource: - url: 'jdbc:h2:file:./target/database/h2' - #url: jdbc:h2:mem:test_mem - username: sa - password: null - driverClassName: org.h2.Driver + url: jdbc:postgresql://hapi-fhir-postgres:5432/hapi + username: admin + password: admin + driverClassName: org.postgresql.Driver max-active: 15 # database connection pool size @@ -32,7 +31,7 @@ spring: #If using H2, then supply the value of ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect #If using postgres, then supply the value of ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect - hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect + hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect # hibernate.hbm2ddl.auto: update # hibernate.jdbc.batch_size: 20 # hibernate.cache.use_query_cache: false