Introduced new variable for server start timeout

Added a new variable in DockerSessionFactory that can be used as a maximum to wait for the server/node to start. Made it adjustable via a DockerFlag and set the default to 60 seconds, which was previously the hardcoded value in that field.

Also added a line to Dockerfile in dev-image, because dev container was not working as is.

Fixes #1

Author: FloKNetcare

java/src/org/openqa/selenium/grid/node/docker/DockerFlags.java

@@ -54,6 +54,12 @@ public class DockerFlags implements HasRoles {
   @ConfigValue(section = DockerOptions.DOCKER_SECTION, name = "port", example = "2375")
   private Integer dockerPort;
 
+  @Parameter(
+      names = {"--docker-server-start-timeout"},
+      description = "Max time (in seconds) to wait for the server to successfully start up, before cancelling the process.")
+  @ConfigValue(section = DockerOptions.DOCKER_SECTION, name = "server-start-timeout", example = "55")
+  private Integer serverStartTimeout;
+
   @Parameter(
       names = {"--docker", "-D"},
       description =

java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.Multimap;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -63,6 +64,7 @@ public class DockerOptions {
   static final String DEFAULT_DOCKER_URL = "unix:/var/run/docker.sock";
   static final String DEFAULT_VIDEO_IMAGE = "false";
   static final int DEFAULT_MAX_SESSIONS = Runtime.getRuntime().availableProcessors();
+  static final int DEFAULT_SERVER_START_TIMEOUT = 60;
   private static final String DEFAULT_DOCKER_NETWORK = "bridge";
   private static final Logger LOG = Logger.getLogger(DockerOptions.class.getName());
   private static final Json JSON = new Json();
@@ -104,6 +106,10 @@ private URI getDockerUri() {
     }
   }
 
+  private Duration getServerStartTimeout() {
+    return Duration.ofSeconds(config.getInt(DOCKER_SECTION, "server-start-timeout").orElse(DEFAULT_SERVER_START_TIMEOUT));
+  }
+
   private boolean isEnabled(Docker docker) {
     if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {
       return false;
@@ -179,6 +185,7 @@ public Map<Capabilities, Collection<SessionFactory>> getDockerSessionFactories(
                     tracer,
                     clientFactory,
                     options.getSessionTimeout(),
+                    getServerStartTimeout(),
                     docker,
                     getDockerUri(),
                     image,

java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java

@@ -91,6 +91,7 @@ public class DockerSessionFactory implements SessionFactory {
   private final Tracer tracer;
   private final HttpClient.Factory clientFactory;
   private final Duration sessionTimeout;
+  private final Duration serverStartTimeout;
   private final Docker docker;
   private final URI dockerUri;
   private final Image browserImage;
@@ -108,6 +109,7 @@ public DockerSessionFactory(
       Tracer tracer,
       HttpClient.Factory clientFactory,
       Duration sessionTimeout,
+      Duration serverStartTimeout,
       Docker docker,
       URI dockerUri,
       Image browserImage,
@@ -123,6 +125,7 @@ public DockerSessionFactory(
     this.tracer = Require.nonNull("Tracer", tracer);
     this.clientFactory = Require.nonNull("HTTP client", clientFactory);
     this.sessionTimeout = Require.nonNull("Session timeout", sessionTimeout);
+    this.serverStartTimeout = Require.nonNull("Server start timeout", serverStartTimeout);
     this.docker = Require.nonNull("Docker command", docker);
     this.dockerUri = Require.nonNull("Docker URI", dockerUri);
     this.browserImage = Require.nonNull("Docker browser image", browserImage);
@@ -181,7 +184,7 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
               "Waiting for server to start (container id: %s, url %s)",
               container.getId(), remoteAddress));
       try {
-        waitForServerToStart(client, Duration.ofMinutes(1));
+        waitForServerToStart(client, serverStartTimeout);
       } catch (TimeoutException e) {
         span.setAttribute(AttributeKey.ERROR.getKey(), true);
         span.setStatus(Status.CANCELLED);
@@ -367,7 +370,7 @@ private Container startVideoContainer(
         clientFactory.createClient(ClientConfig.defaultConfig().baseUri(videoContainerUrl));
     try {
       LOG.fine(String.format("Waiting for video recording... (id: %s)", videoContainer.getId()));
-      waitForServerToStart(videoClient, Duration.ofMinutes(1));
+      waitForServerToStart(videoClient, serverStartTimeout);
     } catch (Exception e) {
       videoContainer.stop(Duration.ofSeconds(10));
       String message =

scripts/dev-image/Dockerfile

@@ -3,6 +3,7 @@ FROM shs96c/selenium-remote-build:latest
 
 USER root
 
+RUN rm -f /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update -qqy && apt-get install -y wget curl gnupg2
 
 # So we can install browsers later