Add sample using Docker Compose #309

devin-ai-integration · 2025-05-19T09:08:11Z

Add sample using Docker Compose

This PR adds a new sample demonstrating how to use Doma Spring Boot with Docker Compose and PostgreSQL.

The sample includes:

A Spring Boot application with Doma integration
Docker Compose configuration for PostgreSQL
A Dockerfile for building the application
Documentation on how to run and use the sample

Fixes #291

Link to Devin run: https://app.devin.ai/sessions/5c0405d96184477a850a6cac86d421c5
Requested by: [email protected]

Co-Authored-By: [email protected] <[email protected]>

devin-ai-integration · 2025-05-19T09:08:19Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T09:12:54Z

@devin-ai-integration

This is not expected work requested in #291

Here is the document for Docker Compose support in Spring Boot.
https://docs.spring.io/spring-boot/reference/features/dev-services.html#features.dev-services.docker-compose

You should create a project from Spring Initializr with "Docker Compose Support" dependency included.

…pose support (#291) Co-Authored-By: [email protected] <[email protected]>

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T09:29:56Z

doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/compose.yaml

@@ -0,0 +1,9 @@
+services:
+  postgres:


Use the generated compose.yaml as is

making · 2025-05-19T09:30:23Z

doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/HELP.md

@@ -0,0 +1,33 @@
+# Getting Started


HELP.md should not be managed in git.
Add HELP.md into .gitignore

making · 2025-05-19T09:33:41Z

...ng-boot-sample-docker-compose/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java

-		"spring.datasource.password=",
-		"spring.datasource.driver-class-name=org.h2.Driver",
-		"doma.dialect=H2"
+    "spring.datasource.url=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1",


Use docker compose in tests as well. That means PostgreSQL should be used in tests instead of H2.

By default, Spring Boot’s Docker Compose support is disabled when running tests.

To enable Docker Compose support in tests, set spring.docker.compose.skip.in-tests to false.

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T09:45:12Z

...ng-boot-sample-docker-compose/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java

-		"spring.datasource.password=",
-		"spring.datasource.driver-class-name=org.h2.Driver",
-		"doma.dialect=H2"
+		"spring.docker.compose.skip.in-tests=false",


duplicated with application.properties

making · 2025-05-19T09:45:34Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/test/resources/application.properties

@@ -0,0 +1,3 @@
+# Enable Docker Compose in tests
+spring.docker.compose.skip.in-tests=false
+doma.dialect=POSTGRES


doma.dialect should be automatically detected by JdbcConnectionDetails

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T09:46:21Z

doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml

+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>


H2 is no longer needed

making · 2025-05-19T09:46:37Z

doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/README.md

+The PostgreSQL configuration is defined in the `compose.yaml` file:
+
+```yaml
+services:


Update README

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T11:09:11Z

@devin-ai-integration rebase the master branch.

Add the same tests as in #310, and reflect the review comments in this PR as well.

closes #303 #304 #305 #306

Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T11:35:55Z

doma-spring-boot-samples/doma-spring-boot-sample-docker-compose/pom.xml

+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>


Remove this dependency as it's included in spring-boot-starter-test

making · 2025-05-19T11:36:29Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/main/resources/application.properties

+
+# Doma configuration
+doma.dialect=POSTGRES
+logging.level.org.springframework.jdbc.datasource.DataSourceTransactionManager=DEBUG


DataSourceTransactionManager is old. Use JdbcTransactionManager instead.

logging.level.org.springframework.jdbc.support.JdbcTransactionManager=DEBUG

making · 2025-05-19T11:38:35Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/test/resources/application.properties

+# Enable Docker Compose in tests
+spring.docker.compose.skip.in-tests=false
+spring.sql.init.mode=always
+spring.sql.init.schema-locations=classpath:schema-test.sql


I don't like having to manage the data twice using schema-test.sql and schema.sql. Instead of using schema-test.sql for testing, perform the reset process in the test code.

… config, remove JUnit dependency Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T12:07:40Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/test/resources/application.properties

-spring.sql.init.schema-locations=classpath:schema-test.sql

 # Database configuration
 spring.datasource.url=jdbc:postgresql://localhost:5432/mydatabase


spring.datasource.* props are useless as these are automatically resolved via Docker Compose based JdbcConnectionDetails

making · 2025-05-19T12:08:19Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/test/resources/application.properties

@@ -1,13 +1,12 @@
 # Enable Docker Compose in tests
 spring.docker.compose.skip.in-tests=false


Remove src/test/resources/application.properties. Using src/main/resources/application.properties should be sufficient

…ation.properties Co-Authored-By: [email protected] <[email protected]>

making · 2025-05-19T12:14:33Z

...oot-samples/doma-spring-boot-sample-docker-compose/src/test/resources/application.properties

@@ -1,12 +0,0 @@
-# Enable Docker Compose in tests
-spring.docker.compose.skip.in-tests=false


Move spring.docker.compose.skip.in-tests=false to src/main/resources/application.properties

Co-Authored-By: [email protected] <[email protected]>

This reverts commit bd35370.

This reverts commit b616f81.

Add Docker Compose sample for Doma Spring Boot (#291)

b5c8da0

Co-Authored-By: [email protected] <[email protected]>

Fix code formatting issues

492079e

Co-Authored-By: [email protected] <[email protected]>

making self-assigned this May 19, 2025

devin-ai-integration bot and others added 2 commits May 19, 2025 09:25

Update Docker Compose sample to use Spring Boot's built-in Docker Com…

9a54fdc

…pose support (#291) Co-Authored-By: [email protected] <[email protected]>

Fix code formatting issues

f8fca44

Co-Authored-By: [email protected] <[email protected]>

making requested changes May 19, 2025

View reviewed changes

Address PR feedback: Use Spring Boot Docker Compose support correctly

22218e7

Co-Authored-By: [email protected] <[email protected]>

making requested changes May 19, 2025

View reviewed changes

Address PR feedback: Remove duplicate properties and auto-detect dialect

0c1d0e9

Co-Authored-By: [email protected] <[email protected]>

making requested changes May 19, 2025

View reviewed changes

Address PR feedback: Remove H2 dependency and update README

54abc1d

Co-Authored-By: [email protected] <[email protected]>

making and others added 5 commits May 19, 2025 11:22

Remove openrewrite maven plugin from pom.xml

8d4b1e1

closes #303 #304 #305 #306

Add TestContainers sample for Doma Spring Boot (#310)

b833b87

Update Docker Compose sample to match TestContainers sample tests

c2b2c05

Co-Authored-By: [email protected] <[email protected]>

Add schema-test.sql to reset database sequence for tests

bc628f6

Co-Authored-By: [email protected] <[email protected]>

Merge branch 'master' into devin/1747645402-add-docker-compose-sample

8f69bac

making requested changes May 19, 2025

View reviewed changes

Address PR feedback: Move sequence reset to test code, update logging…

ccbb570

… config, remove JUnit dependency Co-Authored-By: [email protected] <[email protected]>

making requested changes May 19, 2025

View reviewed changes

Remove test application.properties as it's redundant with main applic…

0090fb5

…ation.properties Co-Authored-By: [email protected] <[email protected]>

making requested changes May 19, 2025

View reviewed changes

devin-ai-integration bot and others added 5 commits May 19, 2025 12:16

Add TestContainers fallback for Docker Compose sample in CI

b616f81

Co-Authored-By: [email protected] <[email protected]>

Format DockerComposeTestConfiguration.java

bd35370

Co-Authored-By: [email protected] <[email protected]>

Revert "Format DockerComposeTestConfiguration.java"

a68bdde

This reverts commit bd35370.

Revert "Add TestContainers fallback for Docker Compose sample in CI"

10064a2

This reverts commit b616f81.

update

739caf8

making approved these changes May 19, 2025

View reviewed changes

making merged commit d6ea084 into master May 19, 2025
6 checks passed

making deleted the devin/1747645402-add-docker-compose-sample branch May 19, 2025 23:24

		@@ -1,13 +1,12 @@
		# Enable Docker Compose in tests
		spring.docker.compose.skip.in-tests=false

		@@ -1,12 +0,0 @@
		# Enable Docker Compose in tests
		spring.docker.compose.skip.in-tests=false

Add sample using Docker Compose #309

Add sample using Docker Compose #309

Uh oh!

Conversation

devin-ai-integration bot commented May 19, 2025

Add sample using Docker Compose

Uh oh!

devin-ai-integration bot commented May 19, 2025

🤖 Devin AI Engineer

Uh oh!

making commented May 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

making commented May 19, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants