Fix #87 (#89)

Azure · Oct 10, 2018 · 008b515 · 008b515
1 parent 0590530
commit 008b515
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/iotedgehubdev/composeproject.py b/iotedgehubdev/composeproject.py
@@ -62,7 +62,7 @@ def compose(self):
 
             if 'env' in config:
                 self.Services[service_name]['environment'] = self.config_env(
-                    self.Services[service_name]['environment'], config['env'])
+                    self.Services[service_name].get('environment', []), config['env'])
 
             if service_name == self.edge_info['hub_name']:
                 self.config_edge_hub(service_name)

diff --git a/tests/test_compose_resources/deployment.json b/tests/test_compose_resources/deployment.json
@@ -26,6 +26,11 @@
             "settings": {
               "image": "mcr.microsoft.com/azureiotedge-hub:1.0",
               "createOptions": "{\"HostConfig\":{\"PortBindings\":{\"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}"
+            },
+            "env": {
+              "OptimizeForPerformance": {
+                "value": "false"
+              }
             }
           }
         },

diff --git a/tests/test_compose_resources/docker-compose.yml b/tests/test_compose_resources/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   edgeHubDev:
     container_name: edgeHubDev
     environment:
+    - OptimizeForPerformance=false
     - routes__r1=FROM /messages/modules/tempSensor/outputs/temperatureOutput INTO
       BrokeredEndpoint("/modules/SampleModule/inputs/input1")
     - routes__r2=FROM /messages/modules/SampleModule/outputs/output1 INTO $$upstream