* Bugfix: Image.getByJson() threw AssertionError if the image registry contained a port number.

* Bugfix: ImageBuilder was not including files recursively when parsing the ADD or COPY commands.
* Bugfix: ImagePuller.pull() was always returning null.
* Replaced Node.getByName() with Node.getById().
* Replaced Swarm.getNodeById() and Swarm.getNodeByName() with Node.getById().
* Renamed Image.getNameToTag() to Image.getNameToTags().
* Renamed Image.getNameToDigest() to Image.getNameToDigests().
* Removed DockerClient parameter from non-static method Image.pusher() since it already has an associated client.
* Added Container.LogStreams.getExceptions().
* Added support for Dockerfile commands that span multiple lines, such as ENTRYPOINT [].
* Replaced non-static method `Image.pusher(name, tag)` with `Image.pusher(name)` where `name` may
  include a tag.

Author: cowwoc

LICENSE-3RD-PARTY.md

@@ -1,6 +1,5 @@
   # Third-party dependencies
   * Apache License, Version 2.0:
-    * [jcommander](https://jcommander.org)
     * [Jackson-annotations](https://github.com/FasterXML/jackson)
     * [Jackson-core](https://github.com/FasterXML/jackson-core)
     * [jackson-databind](https://github.com/FasterXML/jackson)
@@ -15,6 +14,7 @@
     * [Apache Commons Compress](https://commons.apache.org/proper/commons-compress/)
     * [Apache Commons Lang](https://commons.apache.org/proper/commons-lang/)
     * [Apache Mina SSHD :: OSGi](https://www.apache.org/sshd/sshd-osgi/)
+    * [jcommander](https://jcommander.org)
     * [JCL 1.2 implemented over SLF4J](http://www.slf4j.org)
     * [testng](https://testng.org)
   * Apache Software License - Version 2.0:

README.md

@@ -3,7 +3,7 @@
 
 # <img src="docs/logo.svg" width=64 height=64 alt="logo"> Docker Java Client
 
-[![API](https://img.shields.io/badge/api_docs-5B45D5.svg)](https://cowwoc.github.io/docker/0.7/)
+[![API](https://img.shields.io/badge/api_docs-5B45D5.svg)](https://cowwoc.github.io/docker/0.8/)
 [![Changelog](https://img.shields.io/badge/changelog-A345D5.svg)](docs/changelog.md)
 
 A Java client for [Docker](https://www.docker.com/).
@@ -14,7 +14,7 @@ To get started, add this Maven dependency:
 <dependency>
   <groupId>com.github.cowwoc.docker</groupId>
   <artifactId>docker</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
 </dependency>
 ```
 
@@ -51,7 +51,7 @@ class Example
 
 ## Getting Started
 
-See the [API documentation](https://cowwoc.github.io/docker/0.7/) for more details.
+See the [API documentation](https://cowwoc.github.io/docker/0.8/) for more details.
 
 ## Licenses
 

docs/changelog.md

@@ -6,13 +6,18 @@ See https://github.com/cowwoc/docker/commits/main for a full list.
 
 * Bugfix: `ImageBuilder` was not including files recursively when parsing the `ADD` or `COPY` commands.
 * Bugfix: `ImagePuller.pull()` was always returning `null`.
+* Bugfix: `Container.getById()` was throwing an exception if no match was found instead of returning `null`.
 * Replaced `Node.getByName()` with `Node.getById()`.
+* Replaced `Container.getByName()` with `Container.getById()`.
 * Replaced `Swarm.getNodeById()` and `Swarm.getNodeByName()` with `Node.getById()`.
+* Replaced `ContainerNotFoundException` and `ImageNotFoundException` with `ResourceNotFoundException`.
 * Renamed `Image.getNameToTag()` to `Image.getNameToTags()`.
 * Renamed `Image.getNameToDigest()` to `Image.getNameToDigests()`.
-* Removed `DockerClient` parameter from non-static method `Image.pusher()` since it already has an associated
-  client.
+* Replaced non-static method `Image.pusher(client, name, tag)` with `Image.pusher(name)` where `name` may
+  include a tag. The image already has an associated client, so there is no need to pass it a second time.
 * Added `Container.LogStreams.getExceptions()`.
+* Added `Network`.
+* Added support for Dockerfile commands that span multiple lines such as `ENTRYPOINT []`.
 
 ## Version 0.6 - 2025/01/17
 

docs/logo.svg

@@ -50,10 +50,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jetty.version>12.0.16</jetty.version>
 		<jackson.version>2.18.2</jackson.version>
-		<pmd.version>7.9.0</pmd.version>
+		<pmd.version>7.10.0</pmd.version>
 		<maven.checkstyle.version>3.6.0</maven.checkstyle.version>
 		<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-		<requirements.version>10.12-SNAPSHOT</requirements.version>
+		<requirements.version>10.12</requirements.version>
 	</properties>
 
 	<dependencies>
@@ -111,7 +111,7 @@
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
-			<version>7.10.2</version>
+			<version>7.11.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

pom.xml

@@ -3,10 +3,12 @@
 import java.io.IOException;
 import java.io.Serial;
 
+import static com.github.cowwoc.requirements10.java.DefaultJavaValidators.requireThat;
+
 /**
- * Thrown if a referenced container does not exist.
+ * Thrown if a referenced resource does not exist.
  */
-public class ContainerNotFoundException extends IOException
+public class ResourceNotFoundException extends IOException
 {
 	@Serial
 	private static final long serialVersionUID = 0L;
@@ -16,7 +18,7 @@ public class ContainerNotFoundException extends IOException
 	 *
 	 * @param message an explanation of what went wrong
 	 */
-	public ContainerNotFoundException(String message)
+	public ResourceNotFoundException(String message)
 	{
 		super(message);
 	}
@@ -27,8 +29,9 @@ public ContainerNotFoundException(String message)
 	 * @param cause the underlying exception
 	 * @throws NullPointerException if {@code cause} is null
 	 */
-	public ContainerNotFoundException(Throwable cause)
+	public ResourceNotFoundException(Throwable cause)
 	{
 		super(cause);
+		requireThat(cause, "cause").isNotNull();
 	}
 }

src/main/java/com/github/cowwoc/docker/exception/ImageNotFoundException.java

@@ -141,7 +141,11 @@ public ContentResponse send(Request request) throws IOException, TimeoutExceptio
 		{
 			Throwable cause = e.getCause();
 			if (cause instanceof IOException ioe)
-				throw ioe;
+			{
+				// Convert ExecutionException to IOException. We can't throw the cause directly because it does not
+				// contain any stack traces from the current thread. Jetty executes requests in a separate thread.
+				throw new IOException(ioe);
+			}
 			throw new AssertionError(toString(request), e);
 		}
 	}

…xception/ContainerNotFoundException.java …exception/ResourceNotFoundException.javasrc/main/java/com/github/cowwoc/docker/exception/ContainerNotFoundException.java renamed to src/main/java/com/github/cowwoc/docker/exception/ResourceNotFoundException.java src/main/java/com/github/cowwoc/docker/exception/ContainerNotFoundException.java renamed to src/main/java/com/github/cowwoc/docker/exception/ResourceNotFoundException.java

@@ -33,7 +33,7 @@ public abstract class AsyncResponseListener implements Response.Listener
 	 * A CountDownLatch that counts down to zero once the response is ready for processing.
 	 */
 	protected final CountDownLatch responseReady = new CountDownLatch(1);
-	protected final Logger log = LoggerFactory.getLogger(getClass());
+	protected final Logger log = LoggerFactory.getLogger(AsyncResponseListener.class);
 
 	/**
 	 * Creates a new instance.

src/main/java/com/github/cowwoc/docker/internal/client/MainInternalClient.java

@@ -1,9 +1,9 @@
 package com.github.cowwoc.docker.internal.util;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -17,54 +17,140 @@
 public final class DockerfileParser extends GlobParser
 {
 	/**
-	 * Creates a new instance.
+	 * The file being parsed.
 	 */
-	public DockerfileParser()
-	{
-	}
+	private final Path dockerfile;
+	/**
+	 * The directory that contains the Dockerfile.
+	 */
+	private final Path directoryOfDockerfile;
+	/**
+	 * The build context.
+	 */
+	private final Path buildContext;
+	/**
+	 * {@code true} if the previous line ended with a backslash line continuation.
+	 */
+	private boolean lineEndedWithContinuation;
+	/**
+	 * The command being constructed by the parser.
+	 * <p>
+	 * For multi-line commands, this accumulates fragments until the entire command is complete and ready for
+	 * processing.
+	 */
+	private final StringBuilder command = new StringBuilder();
 
 	/**
+	 * Creates a new Dockerfile parser.
+	 *
 	 * @param dockerfile   the path of a {@code Dockerfile}
 	 * @param buildContext the path of the build context
-	 * @return a {@code Predicate<Path>} that returns {@code true} if a path should be included from the build
-	 * 	context
 	 * @throws NullPointerException if any of the arguments are null
-	 * @throws IOException          if an error occurs while reading the file
 	 */
-	public Predicate<Path> parse(Path dockerfile, Path buildContext) throws IOException
+	public DockerfileParser(Path dockerfile, Path buildContext)
 	{
 		// Evaluate Dockerfile relative to the build context
 		assert that(dockerfile, "dockerfile").isRelative().elseThrow();
 		assert that(buildContext, "buildContext").isAbsolute().elseThrow();
+		this.dockerfile = dockerfile;
 
 		Path directoryOfDockerfile = dockerfile.getParent();
 		if (directoryOfDockerfile == null)
 			directoryOfDockerfile = Path.of("");
+
+		this.directoryOfDockerfile = directoryOfDockerfile;
+		this.buildContext = buildContext;
+	}
+
+	/**
+	 * @return a {@code Predicate<Path>} that returns {@code true} if a path should be included from the build
+	 * 	context
+	 * @throws IOException if an error occurs while reading the file
+	 */
+	public Predicate<Path> parse() throws IOException
+	{
 		patterns.add(new PatternPredicate("", buildContext, false, "it is the build context"));
-		addPathsLeadingToDockerfile(dockerfile, directoryOfDockerfile, buildContext);
+		addPathsLeadingToDockerfile(dockerfile);
 
-		List<String> lines = Files.readAllLines(buildContext.resolve(dockerfile));
 		int lineNumber = 0;
-		for (String line : lines)
+		try (BufferedReader reader = Files.newBufferedReader(buildContext.resolve(dockerfile)))
+		{
+			while (true)
+			{
+				++lineNumber;
+				String line = reader.readLine();
+				if (line == null)
+					break;
+				processLine(line, lineNumber);
+			}
+		}
+		if (lineEndedWithContinuation)
+			throw new IllegalArgumentException("Unexpected end of line: " + command);
+		if (!command.isEmpty())
 		{
-			++lineNumber;
-			// https://docs.docker.com/build/concepts/dockerfile/#dockerfile-syntax
-			if (line.startsWith("#"))
-				continue;
-			processLine(line, lineNumber, directoryOfDockerfile, buildContext);
+			// Run the last command
+			processCommand(lineNumber);
 		}
 		return getPredicate(patterns);
 	}
 
 	/**
-	 * Adds predicates for the Dockerfile and the directories leading to it.
+	 * Processes a single line of a Dockerfile command.
 	 *
-	 * @param dockerfile            the path of the Dockerfile relative to the build context
-	 * @param directoryOfDockerfile the directory of the Dockerfile
-	 * @param buildContext          the build context
+	 * @param line       the line
+	 * @param lineNumber the line number
 	 * @throws NullPointerException if any of the arguments are null
 	 */
-	private void addPathsLeadingToDockerfile(Path dockerfile, Path directoryOfDockerfile, Path buildContext)
+	private void processLine(String line, int lineNumber)
+	{
+		// https://docs.docker.com/build/concepts/dockerfile/#dockerfile-syntax
+		if (line.startsWith("#"))
+			return;
+		lineEndedWithContinuation = line.endsWith("\\");
+		if (lineEndedWithContinuation)
+		{
+			command.append(line, 0, line.length() - 1);
+			return;
+		}
+
+		String[] tokens = line.split("\\s+");
+		// Commands that may span multiple lines without a backslash at the end of the line
+		boolean commandMaySpanLines = switch (tokens[0])
+		{
+			case "LABEL", "ENV", "ARG", "VOLUME" -> true;
+			default -> false;
+		};
+		if (commandMaySpanLines)
+		{
+			if (!command.isEmpty())
+			{
+				processCommand(lineNumber);
+				command.delete(0, command.length());
+			}
+			command.append(line);
+			return;
+		}
+		if (line.startsWith(" "))
+		{
+			if (command.isEmpty())
+				throw new IllegalArgumentException("Invalid command on line " + line + ": " + line);
+			// The command is spanning multiple lines
+			command.append(line);
+			return;
+		}
+		// We have detected the end of a command
+		processCommand(lineNumber);
+		command.delete(0, command.length());
+		command.append(line);
+	}
+
+	/**
+	 * Adds predicates for the Dockerfile and the directories leading to it.
+	 *
+	 * @param dockerfile the path of the Dockerfile relative to the build context
+	 * @throws NullPointerException if {@code dockerfile} is null
+	 */
+	private void addPathsLeadingToDockerfile(Path dockerfile)
 	{
 		// Include the Dockerfile and the directories leading to it
 		patterns.add(new PatternPredicate(dockerfile, buildContext, false, "it is the Dockerfile"));
@@ -99,25 +185,17 @@ private Predicate<Path> getPredicate(Set<PatternPredicate> patterns)
 	/**
 	 * Processes a single line.
 	 *
-	 * @param line                  the line
-	 * @param lineNumber            the number of the line
-	 * @param directoryOfDockerfile the directory that contains the Dockerfile
-	 * @param buildContext          the build context
+	 * @param lineNumber the number of the line
 	 * @throws NullPointerException     if any of the values are null
 	 * @throws IllegalArgumentException if the Dockerfile references paths outside the build context
 	 */
-	private void processLine(String line, int lineNumber, Path directoryOfDockerfile,
-		Path buildContext)
+	private void processCommand(int lineNumber)
 	{
-		// Evaluate commands relative to the build context
-		assert that(directoryOfDockerfile, "directoryOfDockerfile").isRelative().elseThrow();
-		assert that(buildContext, "buildContext").isAbsolute().elseThrow();
-
-		line = line.strip();
-		if (line.isEmpty())
+		String command = this.command.toString().strip();
+		if (command.isEmpty())
 			return;
 
-		String[] tokens = line.split("\\s+");
+		String[] tokens = command.split("\\s+");
 		switch (tokens[0])
 		{
 			case "ADD", "COPY" ->