Don't raise an exception if a Docker service doesn't have an environment

and its env property is accessed
galaxyproject · May 2, 2018 · 6984d5f · 6984d5f
1 parent 3e4e285
commit 6984d5f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/lib/galaxy/containers/docker_model.py b/lib/galaxy/containers/docker_model.py
@@ -276,11 +276,14 @@ def state(self):
     @property
     def env(self):
         if not self._env:
-            for env_str in self.inspect['Spec']['TaskTemplate']['ContainerSpec']['Env']:
-                try:
-                    self._env.update([env_str.split('=', 1)])
-                except ValueError:
-                    self._env[env_str] = None
+            try:
+                for env_str in self.inspect['Spec']['TaskTemplate']['ContainerSpec']['Env']:
+                    try:
+                        self._env.update([env_str.split('=', 1)])
+                    except ValueError:
+                        self._env[env_str] = None
+            except KeyError as exc:
+                log.debug('Cannot retrieve container environment: KeyError: %s', str(exc))
         return self._env
 
     @property