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

openvidu-server: simplify DockerManager (no exposed ports or port bindings)

pull/331/head
pabloFuente 2019-09-26 13:46:05 +02:00
parent e78f13db54
commit 2389d22e4a
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -38,11 +38,8 @@ import com.github.dockerjava.api.exception.InternalServerErrorException;
import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.Bind; import com.github.dockerjava.api.model.Bind;
import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Container;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.Ports.Binding;
import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientBuilder;
@ -107,7 +104,7 @@ public class DockerManager {
} }
public String runContainer(String container, String containerName, List<Volume> volumes, List<Bind> binds, public String runContainer(String container, String containerName, List<Volume> volumes, List<Bind> binds,
List<Integer> exposedPorts, Ports portBindings, String networkMode, List<String> envs) throws Exception { String networkMode, List<String> envs) throws Exception {
CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withEnv(envs); CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withEnv(envs);
if (containerName != null) { if (containerName != null) {
@ -121,17 +118,6 @@ public class DockerManager {
if (binds != null) { if (binds != null) {
hostConfig.withBinds(binds); hostConfig.withBinds(binds);
} }
if (exposedPorts != null) {
Ports symmetricPortBindings = new Ports();
List<ExposedPort> expPorts = new ArrayList<>();
exposedPorts.forEach(p -> {
ExposedPort port = ExposedPort.tcp(p);
expPorts.add(port);
symmetricPortBindings.bind(port, Binding.bindPort(p));
});
hostConfig.withPortBindings((portBindings == null) ? symmetricPortBindings : portBindings);
cmd.withExposedPorts(expPorts);
}
cmd.withHostConfig(hostConfig); cmd.withHostConfig(hostConfig);