Skip to content

Commit 3e33397

Browse files
committed
Upgrade to Testcontainers 1.12.3
[resolves #189]
1 parent e72ad45 commit 3e33397

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<scram-client.version>2.1</scram-client.version>
5050
<slf4j.version>1.7.26</slf4j.version>
5151
<spring-framework.version>5.1.8.RELEASE</spring-framework.version>
52-
<testcontainers.version>1.12.1</testcontainers.version>
52+
<testcontainers.version>1.12.3</testcontainers.version>
5353
</properties>
5454

5555
<dependencyManagement>

src/test/java/io/r2dbc/postgresql/util/PostgresqlServerExtension.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,7 @@ public final class PostgresqlServerExtension implements BeforeAllCallback, After
5555
return PostgresqlServerExtension.containerInstance;
5656
}
5757

58-
PostgresqlServerExtension.containerInstance = container();
59-
60-
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
61-
containerInstance.stop();
62-
containerInstance = null;
63-
}, "PostgresqlServerExtension-Shutdown"));
64-
65-
return PostgresqlServerExtension.containerInstance;
58+
return PostgresqlServerExtension.containerInstance = container();
6659
};
6760

6861
private final DatabaseContainer postgres = getContainer();
@@ -199,6 +192,7 @@ private <T extends PostgreSQLContainer<T>> T container() {
199192
.withCopyFileToContainer(getHostPath("pg_hba.conf", 0600), "/var/pg_hba.conf")
200193
.withCopyFileToContainer(getHostPath("setup.sh", 0755), "/var/setup.sh")
201194
.withCopyFileToContainer(getHostPath("test-db-init-script.sql", 0755), "/docker-entrypoint-initdb.d/test-db-init-script.sql")
195+
.withReuse(true)
202196
.withCommand("/var/setup.sh");
203197

204198
return container;

0 commit comments

Comments
 (0)