From 496c1cff920df11fb1ac83e5cb69b867eb8167eb Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Tue, 23 Jun 2020 17:19:27 +0200
Subject: [PATCH] Remove sha256 method and add getImageId and
 getRunningContainers returns container ids if an image id is passed

---
 .../openvidu/server/utils/DockerManager.java  | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
index 6606b080..330dbf6e 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
@@ -27,19 +27,13 @@ import java.util.concurrent.TimeUnit;
 import javax.ws.rs.ProcessingException;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.*;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.*;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -214,15 +208,6 @@ public class DockerManager {
 			return null;
 		}
 	}
-	
-	public String getImageSha256(String image) {
-		try {
-			return CommandExecutor.execCommand(5000, "/bin/sh", "-c", "docker inspect " + image + " -f \"{{ .Id }}\"");	
-		} catch (IOException | InterruptedException e) {
-			log.error(e.getMessage());
-			return null;
-		}
-	}
 
 	public List<String> getRunningContainers(String fullImageName) {
 		List<String> containerIds = new ArrayList<>();
@@ -231,10 +216,18 @@ public class DockerManager {
 			if (container.getImage().startsWith(fullImageName)) {
 				containerIds.add(container.getId());
 			}
+			if (container.getImageId().startsWith(fullImageName)) {
+				containerIds.add(container.getId());
+			}
 		}
 		return containerIds;
 	}
 
+	public String getImageId(String fullImageName) {
+		InspectImageResponse imageResponse = this.dockerClient.inspectImageCmd(fullImageName).exec();
+		return imageResponse.getId();
+	}
+
 	public Map<String, String> getLabels(String containerId) {
 		InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
 		return containerInfo.getConfig().getLabels();