Add configurable base directory and improve chunked HTTP handling

Author: intisy

src/main/java/io/github/intisy/docker/DockerProvider.java

@@ -10,11 +10,83 @@
  * <p>
  * Each provider instance is isolated and can run simultaneously with other instances.
  * Use {@link #getInstanceId()} to get the unique identifier for this instance.
+ * <p>
+ * The base directory for storing Docker data can be configured using {@link #setBaseDirectory(Path)}
+ * before creating any providers. By default, it uses {@code ~/.docker-java/}.
  *
  * @author Finn Birich
  */
 public abstract class DockerProvider {
-    protected static final Path DOCKER_DIR = Paths.get(System.getProperty("user.home"), ".docker-java");
+    private static final Path DEFAULT_DOCKER_DIR = Paths.get(System.getProperty("user.home"), ".docker-java");
+    private static final String DEFAULT_WSL_BASE = ".docker-java";
+    
+    private static Path baseDirectory = DEFAULT_DOCKER_DIR;
+    private static String wslBaseDirectory = DEFAULT_WSL_BASE;
+    
+    /**
+     * Set the base directory for storing Docker data and instances.
+     * This must be called before creating any DockerProvider instances.
+     * <p>
+     * Example:
+     * <pre>{@code
+     * DockerProvider.setBaseDirectory(Paths.get("/custom/path/docker-java"));
+     * DockerProvider provider = DockerProvider.get();
+     * }</pre>
+     *
+     * @param path The base directory path
+     */
+    public static void setBaseDirectory(Path path) {
+        baseDirectory = path;
+    }
+    
+    /**
+     * Get the current base directory for storing Docker data.
+     *
+     * @return The base directory path
+     */
+    public static Path getBaseDirectory() {
+        return baseDirectory;
+    }
+    
+    /**
+     * Set the base directory path for WSL2 (Windows Subsystem for Linux).
+     * This is used when running Docker in WSL2 mode on Windows.
+     * The path is relative to the WSL user's home directory.
+     * <p>
+     * Example:
+     * <pre>{@code
+     * DockerProvider.setWslBaseDirectory(".my-docker-data");
+     * // Results in ~/. my-docker-data/ inside WSL2
+     * }</pre>
+     *
+     * @param path The WSL base directory path (relative to home)
+     */
+    public static void setWslBaseDirectory(String path) {
+        wslBaseDirectory = path;
+    }
+    
+    /**
+     * Get the WSL base directory path.
+     *
+     * @return The WSL base directory path (relative to home)
+     */
+    public static String getWslBaseDirectory() {
+        return wslBaseDirectory;
+    }
+    
+    /**
+     * Reset the base directory to the default ({@code ~/.docker-java/}).
+     */
+    public static void resetBaseDirectory() {
+        baseDirectory = DEFAULT_DOCKER_DIR;
+        wslBaseDirectory = DEFAULT_WSL_BASE;
+    }
+    
+    /**
+     * @deprecated Use {@link #getBaseDirectory()} instead
+     */
+    @Deprecated
+    protected static final Path DOCKER_DIR = DEFAULT_DOCKER_DIR;
 
     /**
      * Get the appropriate DockerProvider for the current operating system.

src/main/java/io/github/intisy/docker/LinuxDockerProvider.java

@@ -55,8 +55,9 @@ public class LinuxDockerProvider extends DockerProvider {
 
     public LinuxDockerProvider() {
         this.instanceId = UUID.randomUUID().toString().substring(0, 8);
-        this.instanceDir = DOCKER_DIR.resolve("instances").resolve(instanceId);
-        setPath(DOCKER_DIR);
+        Path baseDir = getBaseDirectory();
+        this.instanceDir = baseDir.resolve("instances").resolve(instanceId);
+        setPath(baseDir);
         log.debug("Created LinuxDockerProvider with instance ID: {}", instanceId);
     }
 
@@ -253,16 +254,37 @@ public void stop() {
     }
 
     private void cleanupInstanceDirectory() {
+        if (!Files.exists(instanceDir)) {
+            return;
+        }
+        
         try {
-            if (Files.exists(instanceDir)) {
-                try (java.util.stream.Stream<Path> walk = Files.walk(instanceDir)) {
-                    walk.sorted(java.util.Comparator.reverseOrder())
-                            .map(Path::toFile)
-                            .forEach(File::delete);
-                }
+            ProcessBuilder pb = new ProcessBuilder("rm", "-rf", instanceDir.toString());
+            pb.redirectErrorStream(true);
+            Process process = pb.start();
+            boolean completed = process.waitFor(30, TimeUnit.SECONDS);
+            if (!completed) {
+                process.destroyForcibly();
+                log.warn("Cleanup timed out for instance directory: {}", instanceDir);
+            } else if (process.exitValue() != 0) {
+                log.warn("Cleanup returned non-zero exit code for instance directory: {}", instanceDir);
             }
-        } catch (IOException e) {
+        } catch (IOException | InterruptedException e) {
             log.warn("Failed to clean up instance directory: {}", e.getMessage());
+            try {
+                if (Files.exists(instanceDir)) {
+                    try (java.util.stream.Stream<Path> walk = Files.walk(instanceDir)) {
+                        walk.sorted(java.util.Comparator.reverseOrder())
+                                .forEach(path -> {
+                                    try {
+                                        Files.deleteIfExists(path);
+                                    } catch (IOException ignored) {
+                                    }
+                                });
+                    }
+                }
+            } catch (IOException ignored) {
+            }
         }
     }
 

src/main/java/io/github/intisy/docker/MacDockerProvider.java

@@ -45,7 +45,8 @@ public class MacDockerProvider extends DockerProvider {
 
     public MacDockerProvider() {
         this.instanceId = UUID.randomUUID().toString().substring(0, 8);
-        this.instanceDir = DOCKER_DIR.resolve("instances").resolve(instanceId);
+        Path baseDir = getBaseDirectory();
+        this.instanceDir = baseDir.resolve("instances").resolve(instanceId);
         this.runDir = instanceDir.resolve("run");
         this.dataDir = instanceDir.resolve("data");
         this.execDir = instanceDir.resolve("exec");

src/main/java/io/github/intisy/docker/WindowsDockerProvider.java

@@ -46,7 +46,8 @@ public class WindowsDockerProvider extends DockerProvider {
 
     public WindowsDockerProvider() {
         this.instanceId = UUID.randomUUID().toString().substring(0, 8);
-        this.instanceDir = DOCKER_DIR.resolve("instances").resolve(instanceId);
+        Path baseDir = getBaseDirectory();
+        this.instanceDir = baseDir.resolve("instances").resolve(instanceId);
         this.pipeName = "docker_java_" + instanceId;
         this.dockerPipePath = Paths.get("\\\\.\\pipe\\" + pipeName);
         this.dataDir = instanceDir.resolve("data");
@@ -255,9 +256,11 @@ private void startWsl2Docker() throws IOException, InterruptedException {
         }
         log.debug("WSL home directory: {}", wslHome);
 
-        String wslDataDir = wslHome + "/.docker-java/instances/" + instanceId + "/data";
-        String wslExecDir = wslHome + "/.docker-java/instances/" + instanceId + "/exec";
-        String wslPidFile = wslHome + "/.docker-java/instances/" + instanceId + "/docker.pid";
+        String wslBase = getWslBaseDirectory();
+        String wslBaseDir = wslHome + "/" + wslBase + "/instances/" + instanceId;
+        String wslDataDir = wslBaseDir + "/data";
+        String wslExecDir = wslBaseDir + "/exec";
+        String wslPidFile = wslBaseDir + "/docker.pid";
 
         log.debug("Creating directories in WSL2 (distro: {})...", wslDistro);
         String mkdirResult = runWslCommand("mkdir -p " + wslDataDir + " " + wslExecDir + " && echo ok", false, 10);
@@ -574,9 +577,10 @@ public void stop() {
         if (dockerProcess != null) {
             if (usingWsl2 && wslDistro != null) {
                 try {
+                    String wslBase = getWslBaseDirectory();
                     ProcessBuilder pb = new ProcessBuilder("wsl", "-d", wslDistro, "-e", "bash", "-c",
                             "sudo -n pkill -f 'dockerd.*" + dockerPort + "' 2>/dev/null ; " +
-                            "rm -rf ~/.docker-java/instances/" + instanceId);
+                            "rm -rf ~/" + wslBase + "/instances/" + instanceId);
                     pb.start().waitFor(5, TimeUnit.SECONDS);
                 } catch (IOException | InterruptedException e) {
                     log.warn("Failed to stop WSL2 Docker daemon: {}", e.getMessage());

src/main/java/io/github/intisy/docker/command/system/InfoCmd.java

@@ -34,13 +34,18 @@ public SystemInfo exec() {
             }
 
             String body = response.getBody();
-            log.debug("Raw /info response (first 2000 chars): {}", 
-                    body.length() > 2000 ? body.substring(0, 2000) + "..." : body);
 
             try {
                 return client.getGson().fromJson(body, SystemInfo.class);
             } catch (Exception e) {
-                log.error("Failed to parse /info response. Response body: {}", body);
+                System.err.println("=== DOCKER INFO PARSE ERROR ===");
+                System.err.println("Exception: " + e.getClass().getName() + ": " + e.getMessage());
+                if (e.getCause() != null) {
+                    System.err.println("Caused by: " + e.getCause().getClass().getName() + ": " + e.getCause().getMessage());
+                }
+                System.err.println("Response body (first 3000 chars):");
+                System.err.println(body.length() > 3000 ? body.substring(0, 3000) + "..." : body);
+                System.err.println("=== END DOCKER INFO PARSE ERROR ===");
                 throw e;
             }
         } catch (IOException e) {