Fix #26484: Docker Swarm: support private registries

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -22,6 +22,7 @@
 
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.exceptions.DockerException;
+import com.spotify.docker.client.messages.RegistryAuth;
 import com.spotify.docker.client.messages.mount.Mount;
 import com.spotify.docker.client.messages.swarm.DnsConfig;
 import com.spotify.docker.client.messages.swarm.EndpointSpec;
@@ -135,7 +136,21 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
 			serviceSpecBuilder.endpointSpec(EndpointSpec.builder().ports(portsToPublish).build());
 		}
 
-		String serviceId = dockerClient.createService(serviceSpecBuilder.build()).id();
+		String serviceId;
+		if (spec.getDockerSwarmRegistryDomain() != null
+				&& spec.getDockerSwarmRegistryUsername() != null
+				&& spec.getDockerSwarmRegistryPassword() != null) {
+
+			RegistryAuth registryAuth = RegistryAuth.builder()
+					.serverAddress(spec.getDockerSwarmRegistryDomain())
+					.username(spec.getDockerSwarmRegistryUsername())
+					.password(spec.getDockerSwarmRegistryPassword())
+					.build();
+			serviceId = dockerClient.createService(serviceSpecBuilder.build(), registryAuth).id();
+		} else {
+			serviceId = dockerClient.createService(serviceSpecBuilder.build()).id();
+		}
+
 		container.getParameters().put(PARAM_SERVICE_ID, serviceId);
 
 		// Give the service some time to start up and launch a container.

src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java

@@ -46,6 +46,9 @@ public class ContainerSpec {
 	private Map<String, String> labels = new HashMap<>();
 	private Map<String, String> settings = new HashMap<>();
 	private List<DockerSwarmSecret> dockerSwarmSecrets = new ArrayList();
+	private String dockerSwarmRegistryDomain;
+	private String dockerSwarmRegistryUsername;
+	private String dockerSwarmRegistryPassword;
 
 	public String getImage() {
 		return image;
@@ -164,6 +167,30 @@ public void setDockerSwarmSecrets(List<DockerSwarmSecret> dockerSwarmSecrets) {
 		this.dockerSwarmSecrets = dockerSwarmSecrets;
 	}
 
+	public String getDockerSwarmRegistryDomain() {
+		return dockerSwarmRegistryDomain;
+	}
+
+	public void setDockerSwarmRegistryDomain(String dockerSwarmRegistryDomain) {
+		this.dockerSwarmRegistryDomain = dockerSwarmRegistryDomain;
+	}
+
+	public String getDockerSwarmRegistryUsername() {
+		return dockerSwarmRegistryUsername;
+	}
+
+	public void setDockerSwarmRegistryUsername(String dockerSwarmRegistryUsername) {
+		this.dockerSwarmRegistryUsername = dockerSwarmRegistryUsername;
+	}
+
+	public String getDockerSwarmRegistryPassword() {
+		return dockerSwarmRegistryPassword;
+	}
+
+	public void setDockerSwarmRegistryPassword(String dockerSwarmRegistryPassword) {
+		this.dockerSwarmRegistryPassword = dockerSwarmRegistryPassword;
+	}
+
 	public void copy(ContainerSpec target) {
 		target.setImage(image);
 		if (cmd != null) target.setCmd(Arrays.copyOf(cmd, cmd.length));
@@ -197,7 +224,9 @@ public void copy(ContainerSpec target) {
 			if (target.getDockerSwarmSecrets() == null) target.setDockerSwarmSecrets(new ArrayList<>());
 			target.getDockerSwarmSecrets().addAll(dockerSwarmSecrets);
 		}
+		target.setDockerSwarmRegistryDomain(dockerSwarmRegistryDomain);
+		target.setDockerSwarmRegistryUsername(dockerSwarmRegistryUsername);
+		target.setDockerSwarmRegistryPassword(dockerSwarmRegistryPassword);
 		target.setTargetPath(targetPath);
 	}
-
 }

src/main/java/eu/openanalytics/containerproxy/spec/expression/ExpressionAwareContainerSpec.java

@@ -128,6 +128,21 @@ public List<DockerSwarmSecret> getDockerSwarmSecrets() {
 		).collect(Collectors.toList());
 	}
 
+	@Override
+	public String getDockerSwarmRegistryDomain() {
+		return source.getDockerSwarmRegistryDomain();
+	}
+
+	@Override
+	public String getDockerSwarmRegistryUsername() {
+		return source.getDockerSwarmRegistryUsername();
+	}
+
+	@Override
+	public String getDockerSwarmRegistryPassword() {
+		return source.getDockerSwarmRegistryPassword();
+	}
+
 	@Override
 	public Map<String, String> getLabels() {
 		if (source.getLabels() == null) return null;