From 454c4cfdc628ea0b8ea7c219efda9bbd219599f1 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Tue, 13 Oct 2020 22:39:44 +0300 Subject: [PATCH] CB-423 Docker host resolution --- .../src/io/cloudbeaver/server/CBApplication.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java index 0466113f3c..7d0bc151d8 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java @@ -275,16 +275,14 @@ public class CBApplication extends BaseApplicationImpl { // for (InetAddress addr : allMyIps) { // System.out.println("Local addr: " + addr); // } - String dockerHostAddress = System.getenv(CBConstants.VAR_HOST_DOCKER_INTERNAL); - if (!CommonUtils.isEmpty(dockerHostAddress)) { - try { - InetAddress dockerAddress = InetAddress.getByName(dockerHostAddress); - localInetAddresses.add(dockerAddress); - log.debug("\tRun in Docker container (" + dockerAddress + ")"); - } catch (UnknownHostException e) { - // Ignore - } + try { + InetAddress dockerAddress = InetAddress.getByName(CBConstants.VAR_HOST_DOCKER_INTERNAL); + localInetAddresses.add(dockerAddress); + log.debug("\tRun in Docker container (" + dockerAddress + ")"); + } catch (UnknownHostException e) { + // Ignore - not a docker env } + boolean hasLoopbackAddress = false; for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) { NetworkInterface intf = en.nextElement();