Revert latest changes in Docker service and webdriver creator

bonigarcia · Nov 2, 2023 · f6479ba · f6479ba
1 parent cc55c55
commit f6479ba
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 deletions.
diff --git a/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java b/src/main/java/io/github/bonigarcia/wdm/docker/DockerService.java
@@ -209,11 +209,14 @@ public synchronized String startContainer(DockerContainer dockerContainer)
                 hostConfigBuilder.withNetworkMode(network.get());
             }
             List<String> exposedPorts = dockerContainer.getExposedPorts();
-            log.trace("Using exposed ports: {}", exposedPorts);
-            containerConfigBuilder.withExposedPorts(exposedPorts.stream()
-                    .map(ExposedPort::parse).collect(Collectors.toList()));
-            hostConfigBuilder.withPortBindings(exposedPorts.stream()
-                    .map(PortBinding::parse).collect(Collectors.toList()));
+            if (!exposedPorts.isEmpty()) {
+                log.trace("Using exposed ports: {}", exposedPorts);
+                containerConfigBuilder.withExposedPorts(exposedPorts.stream()
+                        .map(ExposedPort::parse).collect(Collectors.toList()));
+                hostConfigBuilder.withPortBindings(exposedPorts.stream()
+                        .map(PortBinding::parse).collect(Collectors.toList()));
+                hostConfigBuilder.withPublishAllPorts(true);
+            }
             Optional<List<Bind>> binds = dockerContainer.getBinds();
             if (binds.isPresent()) {
                 log.trace("Using binds: {}", binds.get());
@@ -565,15 +568,10 @@ public DockerContainer startNoVncContainer(String dockerImage,
         // pull image
         pullImageIfNecessary(cacheKey, dockerImage, browserVersion);
 
-        // network
-        String network = config.getDockerNetwork();
-
         // exposed ports
         List<String> exposedPorts = new ArrayList<>();
         String dockerNoVncPort = String.valueOf(config.getDockerNoVncPort());
-        if (!isHost(network)) {
-            exposedPorts.add(dockerNoVncPort);
-        }
+        exposedPorts.add(dockerNoVncPort);
 
         // envs
         List<String> envs = new ArrayList<>();
@@ -584,14 +582,16 @@ public DockerContainer startNoVncContainer(String dockerImage,
         String vncPort = String.valueOf(config.getDockerVncPort());
         envs.add("VNC_SERVER=" + vncAddress + ":" + vncPort);
 
+        // network
+        String network = config.getDockerNetwork();
+
         // extra hosts
         List<String> extraHosts = config.getDockerExtraHosts();
 
         // builder
         DockerContainer noVncContainer = DockerContainer
-                .dockerBuilder(dockerImage).network(network)
-                .exposedPorts(exposedPorts).extraHosts(extraHosts).envs(envs)
-                .build();
+                .dockerBuilder(dockerImage).exposedPorts(exposedPorts)
+                .network(network).extraHosts(extraHosts).envs(envs).build();
 
         String containerId = startContainer(noVncContainer);
 
@@ -612,16 +612,11 @@ public DockerContainer startBrowserContainer(String dockerImage,
         // pull image
         pullImageIfNecessary(cacheKey, dockerImage, browserVersion);
 
-        // network
-        String network = config.getDockerNetwork();
-
         // exposed ports
+        List<String> exposedPorts = new ArrayList<>();
         String dockerBrowserPort = String
                 .valueOf(config.getDockerBrowserPort());
-        List<String> exposedPorts = new ArrayList<>();
-        if (!isHost(network)) {
-            exposedPorts.add(dockerBrowserPort);
-        }
+        exposedPorts.add(dockerBrowserPort);
 
         // shmSize
         long shmSize = config.getDockerMemSizeBytes(config.getDockerShmSize());
@@ -653,9 +648,7 @@ public DockerContainer startBrowserContainer(String dockerImage,
         String dockerVncPort = String.valueOf(config.getDockerVncPort());
         if (config.isDockerEnabledVnc()) {
             envs.add("ENABLE_VNC=true");
-            if (!isHost(network)) {
-                exposedPorts.add(dockerVncPort);
-            }
+            exposedPorts.add(dockerVncPort);
         }
         if (androidEnabled) {
             envs.add("QTWEBENGINE_DISABLE_SANDBOX=1");
@@ -664,12 +657,15 @@ public DockerContainer startBrowserContainer(String dockerImage,
             envs.add("DRIVER_ARGS=--whitelisted-ips= --allowed-origins=*");
         }
 
+        // network
+        String network = config.getDockerNetwork();
+
         // extra hosts
         List<String> extraHosts = config.getDockerExtraHosts();
 
         // builder
         DockerBuilder dockerBuilder = DockerContainer.dockerBuilder(dockerImage)
-                .network(network).exposedPorts(exposedPorts).mounts(mounts)
+                .exposedPorts(exposedPorts).network(network).mounts(mounts)
                 .binds(binds).shmSize(shmSize).envs(envs).extraHosts(extraHosts)
                 .sysadmin();
         if (androidEnabled) {
@@ -734,7 +730,8 @@ public DockerContainer startRecorderContainer(String dockerImage,
 
         // envs
         List<String> envs = new ArrayList<>();
-        String browserAddress = browserContainer.getAddress();
+        String browserAddress = isHost(network) ? browserContainer.getGateway()
+                : browserContainer.getAddress();
         envs.add("BROWSER_CONTAINER_NAME=" + browserAddress);
         Path recordingPath = getRecordingPath(browserContainer);
         envs.add("FILE_NAME=" + recordingPath.getFileName().toString());

diff --git a/src/main/java/io/github/bonigarcia/wdm/webdriver/WebDriverCreator.java b/src/main/java/io/github/bonigarcia/wdm/webdriver/WebDriverCreator.java
@@ -77,10 +77,10 @@ public WebDriver createRemoteWebDriver(String remoteUrl,
         log.debug("Creating WebDriver object for {} at {} with {}", browserName,
                 remoteUrl, capabilities);
         do {
-            HttpURLConnection huc = null;
             try {
                 URL url = new URL(remoteUrl);
-                huc = (HttpURLConnection) url.openConnection();
+                HttpURLConnection huc = (HttpURLConnection) url
+                        .openConnection();
                 huc.connect();
                 int responseCode = huc.getResponseCode();
                 log.trace("Requesting {} (the response code is {})", remoteUrl,
@@ -101,7 +101,6 @@ public WebDriver createRemoteWebDriver(String remoteUrl,
                                         + " seconds creating WebDriver object",
                                 e1);
                     }
-                    log.debug("Waiting fort {} seconds", POLL_TIME_SEC);
                     Thread.sleep(TimeUnit.SECONDS.toMillis(POLL_TIME_SEC));
                 } catch (InterruptedException e2) {
                     log.warn("Interrupted exception creating WebDriver object",

diff --git a/src/test/java/io/github/bonigarcia/wdm/test/docker/DockerCustomImageTest.java b/src/test/java/io/github/bonigarcia/wdm/test/docker/DockerCustomImageTest.java
@@ -43,7 +43,7 @@ class DockerCustomImageTest {
     WebDriver driver;
 
     WebDriverManager wdm = WebDriverManager.chromedriver().browserInDocker()
-            .dockerCustomImage("selenoid/vnc:chrome_90.0").enableVnc()
+            .dockerCustomImage("selenoid/vnc:chrome_118.0").enableVnc()
             .enableRecording().viewOnly();
 
     @BeforeEach