Bug Fixes

RationaleEmotions · Dec 3, 2019 · f5cc6e0 · f5cc6e0
1 parent 8159062
commit f5cc6e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/rationaleemotions/config/ConfigReader.java b/src/main/java/com/rationaleemotions/config/ConfigReader.java
@@ -9,6 +9,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -71,9 +72,6 @@ public String getDockerImagePort() {
      * @return - The environmental variables to pass to container
      */
     public Map<String, String> getEnvironment() {
-        if (configuration == null) {
-            return new HashMap<>();
-        }        
         return configuration.getEnvironment();
     }
 
@@ -151,8 +149,8 @@ private static class Configuration {
         private String dockerImagePort;
         private int maxSession;
         private String volume;
-        private List<MappingInfo> mapping;
-        private Map<String, String> environment;
+        private List<MappingInfo> mapping = new ArrayList<>();
+        private Map<String, String> environment = new HashMap<>();
 
         public String getDockerRestApiUri() {
             return dockerRestApiUri;

diff --git a/src/main/java/com/rationaleemotions/server/DockerHelper.java b/src/main/java/com/rationaleemotions/server/DockerHelper.java
@@ -99,9 +99,12 @@ public String cgroupPermissions() {
         }
 
         HostConfig.Builder hostConfigBuilder = HostConfig.builder()
-            .binds(ConfigReader.getInstance().getVolume())
             .portBindings(portBindings)
             .privileged(isPrivileged);
+        String volume = ConfigReader.getInstance().getVolume();
+        if (volume != null && !volume.isEmpty()) {
+            hostConfigBuilder = hostConfigBuilder.binds(ConfigReader.getInstance().getVolume());
+        }
         if (!deviceList.isEmpty()) {
             hostConfigBuilder = hostConfigBuilder.devices(deviceList);
         }