[grid][java]: dynamic grid re-fetch browser images if they were prune…

…d during runtime Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
SeleniumHQ · Apr 14, 2024 · f632ae3 · f632ae3
1 parent 6d7e7da
commit f632ae3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/java/src/org/openqa/selenium/docker/ContainerConfig.java b/java/src/org/openqa/selenium/docker/ContainerConfig.java
@@ -84,6 +84,10 @@ public ContainerConfig(
     this.hostConfig = hostConfig;
   }
 
+  public Image getImage() {
+    return this.image;
+  }
+
   public static ContainerConfig image(Image image) {
     return new ContainerConfig(
         image,

diff --git a/java/src/org/openqa/selenium/docker/v1_41/CreateContainer.java b/java/src/org/openqa/selenium/docker/v1_41/CreateContainer.java
@@ -32,6 +32,7 @@
 import org.openqa.selenium.docker.ContainerId;
 import org.openqa.selenium.docker.DockerException;
 import org.openqa.selenium.docker.DockerProtocol;
+import org.openqa.selenium.docker.internal.Reference;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.json.JsonException;
@@ -52,6 +53,24 @@ public CreateContainer(DockerProtocol protocol, HttpHandler client) {
   }
 
   public Container apply(ContainerConfig info) {
+    try {
+      return createContainer(info);
+    } catch (DockerException e) {
+      if (e.getMessage().contains("No such image")) {
+        return pullImageAndCreateContainer(info);
+      } else {
+        throw e;
+      }
+    }
+  }
+
+  private Container pullImageAndCreateContainer(ContainerConfig info) {
+    PullImage pullImage = new PullImage(client);
+    pullImage.apply(Reference.parse(info.getImage().getName()));
+    return createContainer(info);
+  }
+
+  public Container createContainer(ContainerConfig info) {
     HttpResponse res =
         DockerMessages.throwIfNecessary(
             client.execute(