From 04434215d0931e4d9db2f27bc3b629d383bede1f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 6 Jul 2022 14:27:28 +1200
Subject: [PATCH] #2740 - Bump ebean-test-containers to 6.2

---
 .../io/ebean/test/config/platform/Config.java |  9 +--
 .../test/config/platform/DockerHost.java      | 55 -------------------
 pom.xml                                       |  2 +-
 3 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 ebean-test/src/main/java/io/ebean/test/config/platform/DockerHost.java

diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
index 4dd36034a..44207a393 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
@@ -2,6 +2,7 @@ package io.ebean.test.config.platform;
 
 import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
+import io.ebean.test.containers.DockerHost;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +39,6 @@ class Config {
   private final DatabaseConfig config;
   private boolean containerDropCreate;
   private final Properties dockerProperties = new Properties();
-  private final DockerHost dockerHost = new DockerHost();
 
   Config(String db, String platform, String databaseName, DatabaseConfig config) {
     this.db = db;
@@ -241,8 +241,7 @@ class Config {
   }
 
   String host() {
-    String explicitDockerHost = getKey("dockerHost", null);
-    return getKey("host", dockerHost.dockerHost(explicitDockerHost));
+    return getKey("host", getKey("dockerHost", DockerHost.host()));
   }
 
   /**
@@ -385,10 +384,6 @@ class Config {
   }
 
   private void initDockerProperties() {
-    if (dockerHost.runningInDocker()) {
-      // tell ebean-docker-test we are not using localhost (for jdbc DB setup commands)
-      dockerProperties.setProperty(dockerKey("host"), dockerHost.dockerHost());
-    }
     dockerProperties.setProperty(dockerKey("port"), String.valueOf(port));
     dockerProperties.setProperty(dockerKey("dbName"), databaseName);
     if (schema != null) {
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/DockerHost.java b/ebean-test/src/main/java/io/ebean/test/config/platform/DockerHost.java
deleted file mode 100644
index 5e3f0ce94..000000000
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/DockerHost.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.ebean.test.config.platform;
-
-import java.io.File;
-import java.util.Locale;
-
-/**
- * Helper to detect if running inside docker and determine host name for that case.
- */
-class DockerHost {
-
-  private final boolean runningInDocker;
-  private String dockerHost;
-
-  DockerHost() {
-    runningInDocker = initInDocker();
-  }
-
-  boolean runningInDocker() {
-    return runningInDocker;
-  }
-
-  String dockerHost() {
-    return dockerHost;
-  }
-
-  String dockerHost(String explicitHost) {
-    if (!runningInDocker) {
-      return "localhost";
-    }
-    dockerHost = explicitHost != null ? explicitHost : defaultDockerHost();
-    return dockerHost;
-  }
-
-  /**
-   * Return true if running inside a docker container (we are using docker in docker).
-   */
-  boolean initInDocker() {
-    return new File("/.dockerenv").exists();
-  }
-
-  /**
-   * Return the default host name to use when running in docker.
-   * <p>
-   * Can instead be explicitly specified via <code>ebean.test.dockerHost</code>.
-   */
-  String defaultDockerHost() {
-    String os = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
-    if (os.contains("mac") || os.contains("darwin") || os.contains("win")) {
-      return "host.docker.internal";
-    } else {
-      return "172.17.0.1";
-    }
-  }
-
-}
diff --git a/pom.xml b/pom.xml
index 4e2418885..381584a8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <ebean-ddl-runner.version>2.0</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>13.6.0</ebean-migration.version>
-    <ebean-test-containers.version>6.1</ebean-test-containers.version>
+    <ebean-test-containers.version>6.2</ebean-test-containers.version>
     <ebean-datasource.version>8.0</ebean-datasource.version>
     <ebean-agent.version>13.6.5</ebean-agent.version>
     <ebean-maven-plugin.version>13.6.5</ebean-maven-plugin.version>