From b523b3835f94322622336a4ac641367cb2bb43d0 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 8 Jan 2020 10:41:36 -0500 Subject: [PATCH] Implement changes suggested by testcontainer dev (#426) * Implement changes suggested by testcontainer dev See https://github.com/google/nomulus/issues/401 Specifically: - Use getContainerIpAddress() instead of localhost to insulate us from off-machine docker usage. - Remove shutdown hook to close the container, as testcontainers does this for us. --- .../registry/model/transaction/JpaTransactionManagerRule.java | 1 - .../java/google/registry/webdriver/DockerWebDriverRule.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java b/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java index de3e44fe3..4495795a6 100644 --- a/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java +++ b/core/src/test/java/google/registry/model/transaction/JpaTransactionManagerRule.java @@ -97,7 +97,6 @@ abstract class JpaTransactionManagerRule extends ExternalResource { new PostgreSQLContainer(NomulusPostgreSql.getDockerTag()) .withDatabaseName(MANAGEMENT_DB_NAME); container.start(); - Runtime.getRuntime().addShutdownHook(new Thread(() -> container.close())); return container; } diff --git a/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java b/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java index 0df6b1a0e..96ded68d1 100644 --- a/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java +++ b/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java @@ -52,7 +52,8 @@ class DockerWebDriverRule extends ExternalResource { url = new URL( String.format( - "http://localhost:%d/wd/hub", + "http://%s:%d/wd/hub", + container.getContainerIpAddress(), container.getMappedPort(CHROME_DRIVER_SERVICE_PORT))); } catch (MalformedURLException e) { throw new IllegalArgumentException(e);