diff --git a/src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java b/src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java index 717dd6cb34..46d7a30667 100644 --- a/src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java +++ b/src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java @@ -11,14 +11,14 @@ import java.sql.Connection; import java.sql.SQLException; +import java.util.Optional; import static java.sql.DriverManager.getConnection; import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT; public class PostgresTestDocker { - private static final Logger logger = LoggerFactory.getLogger(PostgresTestDocker.class); - + private static final boolean IS_CI = Boolean.parseBoolean(System.getenv("CI")); private static final String DB_NAME = "connector_test"; private static final String DB_USERNAME = "test"; private static final String DB_PASSWORD = "test"; @@ -32,12 +32,16 @@ public static void getOrCreate() { POSTGRES_CONTAINER = new PostgreSQLContainer<>("postgres:15.2") .withUsername(DB_USERNAME) .withPassword(DB_PASSWORD) - .withCreateContainerCmdModifier(cmd -> cmd.withHostConfig( - new HostConfig().withPortBindings(new PortBinding( - Ports.Binding.bindIp("127.0.0.1"), - new ExposedPort(POSTGRESQL_PORT) - )) - )); + .withCreateContainerCmdModifier(cmd -> { + if (!IS_CI) { + cmd.withHostConfig( + new HostConfig().withPortBindings(new PortBinding( + Ports.Binding.bindIp("127.0.0.1"), + new ExposedPort(POSTGRESQL_PORT) + )) + ); + } + }); POSTGRES_CONTAINER.start(); createDatabase(); diff --git a/src/test/java/uk/gov/pay/connector/rules/SqsTestDocker.java b/src/test/java/uk/gov/pay/connector/rules/SqsTestDocker.java index 49452e38be..a5722f1644 100644 --- a/src/test/java/uk/gov/pay/connector/rules/SqsTestDocker.java +++ b/src/test/java/uk/gov/pay/connector/rules/SqsTestDocker.java @@ -22,7 +22,7 @@ public class SqsTestDocker { private static final Logger logger = LoggerFactory.getLogger(SqsTestDocker.class); - + private static final boolean IS_CI = Boolean.parseBoolean(System.getenv("CI")); private static GenericContainer sqsContainer; public static AmazonSQS initialise(List queueNames) { @@ -41,12 +41,16 @@ private static void createContainer() { sqsContainer = new GenericContainer("softwaremill/elasticmq-native:1.4.2") .withExposedPorts(9324) - .withCreateContainerCmdModifier((Consumer) cmd -> cmd.withHostConfig( - new HostConfig().withPortBindings(new PortBinding( - Ports.Binding.bindIp("127.0.0.1"), - new ExposedPort(9324) - )) - )) + .withCreateContainerCmdModifier((Consumer) cmd -> { + if (!IS_CI) { + cmd.withHostConfig( + new HostConfig().withPortBindings(new PortBinding( + Ports.Binding.bindIp("127.0.0.1"), + new ExposedPort(9324) + )) + ); + } + }) .waitingFor(Wait.forLogMessage(".*ElasticMQ server.*.*started.*", 1)); sqsContainer.start(); }