ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: Add labels and getLabels in DockerManager

pull/508/head
cruizba 2020-06-10 21:41:40 +02:00
parent ac30d55a1e
commit 1d252e62ec
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
View File

@ -175,7 +175,7 @@ public class ComposedRecordingService extends RecordingService {
List<Bind> binds = new ArrayList<>(); List<Bind> binds = new ArrayList<>();
binds.add(bind1); binds.add(bind1);
containerId = dockerManager.runContainer(container, containerName, null, volumes, binds, "host", envs, null, containerId = dockerManager.runContainer(container, containerName, null, volumes, binds, "host", envs, null,
536870912L, false); 536870912L, false, null);
containers.put(containerId, containerName); containers.put(containerId, containerName);
} catch (Exception e) { } catch (Exception e) {
this.cleanRecordingMaps(recording); this.cleanRecordingMaps(recording);

14
openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
View File

@ -20,11 +20,13 @@ package io.openvidu.server.utils;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.ws.rs.ProcessingException; import javax.ws.rs.ProcessingException;
import com.github.dockerjava.api.command.InspectContainerResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -104,7 +106,8 @@ public class DockerManager {
} }
public String runContainer(String container, String containerName, String user, List<Volume> volumes, public String runContainer(String container, String containerName, String user, List<Volume> volumes,
List<Bind> binds, String networkMode, List<String> envs, List<String> command, Long shmSize, boolean privileged) List<Bind> binds, String networkMode, List<String> envs, List<String> command, Long shmSize, boolean privileged,
Map<String, String> labels)
throws Exception { throws Exception {
CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withEnv(envs); CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withEnv(envs);
@ -127,6 +130,10 @@ public class DockerManager {
hostConfig.withBinds(binds); hostConfig.withBinds(binds);
} }
if (labels != null) {
cmd.withLabels(labels);
}
if (command != null) { if (command != null) {
cmd.withCmd(command); cmd.withCmd(command);
} }
@ -217,6 +224,11 @@ public class DockerManager {
return containerIds; return containerIds;
} }
public Map<String, String> getLabels(String containerId) {
InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
return containerInfo.getConfig().getLabels();
}
static public String getDockerGatewayIp() { static public String getDockerGatewayIp() {
try { try {
return CommandExecutor.execCommand(5000, "/bin/sh", "-c", return CommandExecutor.execCommand(5000, "/bin/sh", "-c",