Update Linux Tools to use docker-client 8.0.3 (#430)

- fix some changes that have been made to configuration structures

Author: jjohnstn

Diff for: containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2020 Red Hat.
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -22,9 +22,9 @@
 import java.util.TreeSet;
 
 import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
-
 import org.mandas.docker.client.messages.ContainerConfig;
 import org.mandas.docker.client.messages.HostConfig;
+import org.mandas.docker.client.messages.ImageConfig;
 
 public class DockerContainerConfig implements IDockerContainerConfig {
 
@@ -55,7 +55,7 @@ public class DockerContainerConfig implements IDockerContainerConfig {
 	private final List<String> onBuild;
 	private final Map<String, String> labels;
 
-	public DockerContainerConfig(final ContainerConfig containerConfig) {
+	public DockerContainerConfig(final ImageConfig containerConfig) {
 		this.hostname = containerConfig != null ? containerConfig.hostname()
 				: null;
 		this.domainname = containerConfig != null ? containerConfig.domainname()
@@ -114,6 +114,74 @@ public DockerContainerConfig(final ContainerConfig containerConfig) {
 		this.labels = containerConfig != null ? containerConfig.labels() : null;
 	}
 
+	public DockerContainerConfig(final ContainerConfig containerConfig) {
+		this.hostname = containerConfig != null ? containerConfig.hostname()
+				: null;
+		this.domainname = containerConfig != null ? containerConfig.domainname()
+				: null;
+		this.user = containerConfig != null ? containerConfig.user() : null;
+		final HostConfig hc = containerConfig != null
+				? containerConfig.hostConfig()
+				: null;
+		this.memory = hc != null ? hc.memory() : null;
+		this.memorySwap = hc != null ? hc.memorySwap() : null;
+		this.cpuShares = hc != null ? hc.cpuShares() : null;
+		this.cpuset = hc != null ? hc.cpusetCpus() : null;
+		this.attachStdin = containerConfig != null
+				&& containerConfig.attachStdin() != null
+						? containerConfig.attachStdin()
+						: false;
+		this.attachStdout = containerConfig != null
+				&& containerConfig.attachStdout() != null
+						? containerConfig.attachStdout()
+						: false;
+		this.attachStderr = containerConfig != null
+				&& containerConfig.attachStderr() != null
+						? containerConfig.attachStderr()
+						: false;
+		this.portSpecs = containerConfig != null ? containerConfig.portSpecs()
+				: null;
+		this.exposedPorts = containerConfig != null
+				? containerConfig.exposedPorts()
+				: null;
+		this.tty = containerConfig != null && containerConfig.tty() != null
+				? containerConfig.tty()
+				: false;
+		this.openStdin = containerConfig != null
+				&& containerConfig.openStdin() != null
+						? containerConfig.openStdin()
+						: false;
+		this.stdinOnce = containerConfig != null
+				&& containerConfig.stdinOnce() != null
+						? containerConfig.stdinOnce()
+						: false;
+		this.env = containerConfig != null ? containerConfig.env() : null;
+		this.cmd = containerConfig != null ? containerConfig.cmd() : null;
+		this.image = containerConfig != null ? containerConfig.image() : null;
+
+		@SuppressWarnings("rawtypes")
+		Map<String, Map> res = new HashMap<>();
+		try {
+			if (containerConfig != null && containerConfig.volumes() != null) {
+				containerConfig.volumes()
+						.forEach(v -> res.put(v, Collections.emptyMap()));
+			}
+		} catch (NullPointerException e) {
+		}
+		this.volumes = res;
+		this.workingDir = containerConfig != null ? containerConfig.workingDir()
+				: null;
+		this.entrypoint = containerConfig != null ? containerConfig.entrypoint()
+				: null;
+		this.networkDisabled = containerConfig != null
+				&& containerConfig.networkDisabled() != null
+						? containerConfig.networkDisabled()
+						: false;
+		this.onBuild = containerConfig != null ? containerConfig.onBuild()
+				: null;
+		this.labels = containerConfig != null ? containerConfig.labels() : null;
+	}
+
 	private DockerContainerConfig(final Builder builder) {
 		this.hostname = builder.hostname;
 		this.domainname = builder.domainname;
@@ -600,7 +668,7 @@ public DockerContainerConfig build() {
 
 		/**
 		 * Create a proper command list after handling quotation.
-		 * 
+		 *
 		 * @param command
 		 *            the command as a single {@link String}
 		 * @return the command splitted in a list of ars or <code>null</code> if

Diff for: containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImageInfo.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2014, 2020 Red Hat.
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -16,7 +16,6 @@
 
 import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
 import org.eclipse.linuxtools.docker.core.IDockerImageInfo;
-
 import org.mandas.docker.client.messages.ImageInfo;
 
 public class DockerImageInfo implements IDockerImageInfo {
@@ -41,7 +40,8 @@ public DockerImageInfo(final ImageInfo info) {
 		this.created = info != null ? info.created() : null;
 		this.container = info != null ? info.container() : null;
 		this.containerConfig = info != null
-				? new DockerContainerConfig(info.containerConfig()) : null;
+				? new DockerContainerConfig(info.config())
+				: null;
 		this.dockerVersion = info != null ? info.dockerVersion() : null;
 		this.author = info != null ? info.author() : null;
 		this.config = info != null ? new DockerContainerConfig(info.config())

Diff for: containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageInfoFactory.java

@@ -19,6 +19,7 @@
 import java.util.Set;
 
 import org.mandas.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.ImageConfig;
 import org.mandas.docker.client.messages.ImageInfo;
 import org.mockito.Mockito;
 
@@ -76,7 +77,8 @@ public Builder env(final List<String> env) {
 		public ImageInfo build() {
 			final ContainerConfig config = Mockito.mock(ContainerConfig.class);
 			final ContainerConfig containerConfig = Mockito.mock(ContainerConfig.class);
-			Mockito.when(this.imageInfo.config()).thenReturn(config);
+			final ImageConfig imageConfig = Mockito.mock(ImageConfig.class);
+			Mockito.when(this.imageInfo.config()).thenReturn(imageConfig);
 			Mockito.when(this.imageInfo.containerConfig()).thenReturn(containerConfig);
 			Mockito.when(config.cmd()).thenReturn(List.copyOf(this.command));
 			Mockito.when(config.entrypoint()).thenReturn(List.copyOf(this.entrypoint));

Diff for: releng/org.eclipse.linuxtools.target/linuxtools-latest.target

@@ -277,7 +277,7 @@
 			<dependency>
 				<groupId>org.mandas</groupId>
 				<artifactId>docker-client</artifactId>
-				<version>8.0.2</version>
+				<version>8.0.3</version>
 				<type>jar</type>
 			</dependency>
 		</dependencies>