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

openvidu-server: allow configuring network mode for Docker containers

pull/255/head
pabloFuente 2019-04-03 11:33:00 +02:00
parent 204e05aed2
commit 2fd248e4ae
3 changed files with 4 additions and 4 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

@ -162,7 +162,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, envs); containerId = dockerManager.runContainer(container, containerName, volumes, binds, null, "host", envs);
containers.put(containerId, containerName); containers.put(containerId, containerName);
} catch (Exception e) { } catch (Exception e) {
this.cleanRecordingMaps(recording); this.cleanRecordingMaps(recording);

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

@ -124,7 +124,7 @@ public class RecordingManager {
this.singleStreamRecordingService = new SingleStreamRecordingService(this, openviduConfig); this.singleStreamRecordingService = new SingleStreamRecordingService(this, openviduConfig);
log.info("Recording module required: Downloading openvidu/openvidu-recording:" log.info("Recording module required: Downloading openvidu/openvidu-recording:"
+ openviduConfig.getOpenViduRecordingVersion() + " Docker image (400MB aprox)"); + openviduConfig.getOpenViduRecordingVersion() + " Docker image (350MB aprox)");
this.checkRecordingRequirements(this.openviduConfig.getOpenViduRecordingPath(), this.checkRecordingRequirements(this.openviduConfig.getOpenViduRecordingPath(),
this.openviduConfig.getOpenviduRecordingCustomLayout()); this.openviduConfig.getOpenviduRecordingCustomLayout());

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

@ -122,10 +122,10 @@ 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, List<String> envs) throws Exception { List<Integer> exposedPorts, String networkMode, List<String> envs) throws Exception {
CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withName(containerName).withEnv(envs); CreateContainerCmd cmd = dockerClient.createContainerCmd(container).withName(containerName).withEnv(envs);
HostConfig hostConfig = new HostConfig().withNetworkMode("host"); HostConfig hostConfig = new HostConfig().withNetworkMode(networkMode);
if (volumes != null) { if (volumes != null) {
cmd.withVolumes(volumes); cmd.withVolumes(volumes);
} }