Deduplicate "is running in docker" usages

GitOrigin-RevId: a82d19464eb36c85ac96cfa221f379a827916a82

Author: aparajon

Diff for: misk-aws/build.gradle.kts

@@ -29,6 +29,7 @@ dependencies {
   implementation(libs.slf4jApi)
   implementation(libs.tracingDatadog)
   implementation(project(":misk-api"))
+  implementation(project(":wisp:wisp-containers-testing"))
   implementation(project(":wisp:wisp-deployment"))
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":wisp:wisp-tracing"))

Diff for: misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt

@@ -15,6 +15,7 @@ import java.util.concurrent.ConcurrentHashMap
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
 import misk.moshi.adapter
+import wisp.containers.ContainerUtil
 
 @Singleton
 internal class QueueResolver @Inject internal constructor(
@@ -97,13 +98,8 @@ internal class QueueResolver @Inject internal constructor(
     }
   }
 
-  private fun isRunningInDocker() = File("/proc/1/cgroup")
-    .takeIf { it.exists() }?.useLines { lines ->
-      lines.any { it.contains("/docker") }
-    } ?: false
-
   private fun ensureUrlWithProperTarget(url: String): String {
-    if (isRunningInDocker())
+    if (ContainerUtil.isRunningInDocker)
       return url.replace("localhost", hostInternalTarget).replace("127.0.0.1", hostInternalTarget)
     else
       return url

Diff for: misk-jdbc/build.gradle.kts

@@ -31,6 +31,7 @@ dependencies {
   implementation(project(":misk-backoff"))
   implementation(project(":misk-docker"))
   implementation(project(":misk-service"))
+  implementation(project(":wisp:wisp-containers-testing"))
   implementation(project(":wisp:wisp-logging"))
   implementation(project(":wisp:wisp-moshi"))
   implementation(libs.jsqlparser)

Diff for: misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceConfig.kt

@@ -2,8 +2,8 @@ package misk.jdbc
 
 import misk.config.Redact
 import wisp.config.Config
+import wisp.containers.ContainerUtil
 import wisp.deployment.Deployment
-import java.io.File
 import java.time.Duration
 
 /** Defines a type of datasource */
@@ -142,19 +142,12 @@ data class DataSourceConfig @JvmOverloads constructor(
     }
   }
   fun withDefaults(): DataSourceConfig {
-    val isRunningInDocker = File("/proc/1/cgroup")
-      .takeIf { it.exists() }?.useLines { lines ->
-        lines.any { it.contains("/docker") }
-      } ?: false
-    val server_hostname = if (isRunningInDocker)
-        "host.docker.internal"
-      else
-        "127.0.0.1"
+    val server_hostname = ContainerUtil.dockerTargetOrLocalIp()
     return when (type) {
       DataSourceType.MYSQL -> {
         copy(
           port = port ?: 3306,
-          host = host ?: System.getenv("MYSQL_HOST") ?: "127.0.0.1",
+          host = host ?: System.getenv("MYSQL_HOST") ?: server_hostname,
           database = database ?: ""
         )
       }

Diff for: misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedis.kt

@@ -11,7 +11,7 @@ import misk.testing.ExternalDependency
 import redis.clients.jedis.JedisPooled
 import wisp.containers.Composer
 import wisp.containers.Container
-import wisp.containers.ContainerUtil.isRunningInDocker
+import wisp.containers.ContainerUtil
 import wisp.logging.getLogger
 import java.lang.Thread.sleep
 import java.time.Duration
@@ -28,7 +28,7 @@ import java.time.Duration
  */
 object DockerRedis : ExternalDependency {
   private const val port = 6379
-  private val hostname = if (isRunningInDocker) "host.docker.internal" else "localhost"
+  private val hostname = ContainerUtil.dockerTargetOrLocalHost()
   private val logger = getLogger<DockerRedis>()
   private const val redisVersion = "6.2"
 

Diff for: misk-redis/src/testFixtures/kotlin/misk/redis/testing/DockerRedisCluster.kt

@@ -30,7 +30,7 @@ import java.time.Duration
 object DockerRedisCluster : ExternalDependency {
   private val REDIS_CLUSTER_PORTS = listOf(7000, 7001, 7002, 7003, 7004, 7005)
   private const val initialPort = 7000
-  private val hostname = if (ContainerUtil.isRunningInDocker) "host.docker.internal" else "localhost"
+  private val hostname = ContainerUtil.dockerTargetOrLocalHost()
   private val logger = getLogger<DockerRedisCluster>()
   private const val redisVersion = "7.0.10"