From f00554ad2204329c1e848057f9840b52a6619f52 Mon Sep 17 00:00:00 2001
From: ccottier <ccottier@USA-MAC-NIS1672.local>
Date: Mon, 19 Apr 2021 18:59:26 -0500
Subject: [PATCH] working docker compose containers
---
docker-compose.yml | 16 ++++++++++------
src/main/resources/application.properties | 8 +++++++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e9c44e9..f1cb2a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,25 @@
version: "3.5"
services:
- emp_db:
- container_name: pgDatabase
+ empdb:
+ container_name: empdb
image: postgres
- ports:
- - 3191:5432
+ expose:
+ - "5432"
networks:
- empnetwork
+ environment:
+ - POSTGRES_USER=emp_serv
+ - POSTGRES_PASSWORD=emp_serv
+ - POSTGRES_DB=emp_serv
spring_boot:
container_name: employeesApp
- image: ccottiernsm/employee-service
+ image: employee-serv
ports:
- 8081:8080
depends_on:
- - emp_db
+ - empdb
networks:
- empnetwork
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4305199..bdf2f6e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,15 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/emp_serv_db
+spring.datasource.url=jdbc:postgresql://empdb:5432/emp_serv
spring.datasource.driverClassName=org.postgresql.Driver
spring.datasource.username=emp_serv
spring.datasource.password=emp_serv
spring.datasource.schema=classpath:employee.sql
+
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL81Dialect
+
#spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
#spring.jpa.hibernate.ddl-auto=none
--
2.18.1