Add docker compose

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre-alpine
+FROM eclipse-temurin:21-jdk-alpine
 VOLUME /tmp
 WORKDIR /app
 COPY run.sh .

README.md

@@ -16,7 +16,7 @@ Project based on [Spring Guide](https://spring.io/guides/tutorials/rest/)
 
 ### Todo
 
-*For the sake of simplicity, only the Employee model has tests*
+For the sake of simplicity, only the Employee model has tests
 
 - [Tests](https://docs.spring.io/spring-boot/docs/3.2.2/reference/html/features.html#features.testing)
 
@@ -25,19 +25,18 @@ Project based on [Spring Guide](https://spring.io/guides/tutorials/rest/)
   - [x] Integration
   - [x] [WebMvc](https://spring.io/guides/gs/testing-web/)
 
-
 - [CI/CD GitHub Actions](https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven)
 
   - [x] Build
   - [x] Test
-  - [ ] Publish API Docs
+  - [ ] Publish API Docs (Bônus)
 
 ### Bônus 🎁
 
-- [ ] Replace H2 for Postgres
-- [ ] Monitor Postgres with PGAdmin
+- [x] Replace H2 for [Postgres](https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/)
+- [x] [Monitor Postgres with PGAdmin](https://github.com/docker/awesome-compose/tree/master/postgresql-pgadmin)
 - [ ] [Caching (Redis)](https://docs.spring.io/spring-framework/reference/integration/cache/annotations.html)
+- [x] [Docker Compose](https://github.com/docker/awesome-compose/tree/master/spring-postgres)
 - [ ] Nginx
-- [ ] Docker Compose
 - [ ] [Performance Test (Jmeter)](https://jmeter.apache.org/index.html)
 - [ ] [API Docs with Restdocs](https://spring.io/guides/gs/testing-restdocs/)

compose.yaml

@@ -0,0 +1,42 @@
+version: '3.8'
+
+volumes:
+  pgdata:
+
+services:
+  app:
+    container_name: app
+    build: .
+    ports:
+      - "8080:8080"
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+  postgres:
+    container_name: postgres
+    image: postgres:14.5
+    environment:
+      - POSTGRES_DB=${DB_NAME}
+      - POSTGRES_USER=${DB_USERNAME}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+    ports:
+      - "5432:5432"
+    restart: always
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${DB_USERNAME} -d ${DB_NAME} -h 127.0.0.1 -p 5432" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+
+  pgadmin:
+    container_name: pgadmin
+    image: dpage/pgadmin4:8.2
+    restart: always
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_MAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASSWORD}
+    ports:
+      - "5050:80"

example.env

@@ -0,0 +1,6 @@
+DB_URL=<your-value>
+DB_USERNAME=<your-value>
+DB_PASSWORD=<your-value>
+DB_NAME=<your-value>
+PGADMIN_MAIL=<your-value>
+PGADMIN_PASSWORD=<your-value>

pom.xml

@@ -39,11 +39,11 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.h2database</groupId>-->
+<!--            <artifactId>h2</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
 
         <!-- Metrics -->
         <dependency>

src/main/resources/application.properties

@@ -1,3 +1,15 @@
+# Database
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${DB_USERNAME}
+spring.datasource.password=${DB_PASSWORD}
+
+# Enable SQL logging
+spring.datasource.log-statement=true
+
+# Hibernate specific: Show SQL with formatted parameters
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+
 # Observability
 # management.wavefront.application.name=rest
 # management.wavefront.application.service-name=app