浏览代码

Fix secret location with absolute paths

Signed-off-by: Andrea Giardini <[email protected]>
Andrea Giardini 8 年之前
父节点
当前提交
07b30e3145
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      compose/service.py

+ 6 - 3
compose/service.py

@@ -881,9 +881,12 @@ class Service(object):
 
 
     def get_secret_volumes(self):
     def get_secret_volumes(self):
         def build_spec(secret):
         def build_spec(secret):
-            target = '{}/{}'.format(
-                const.SECRETS_PATH,
-                secret['secret'].target or secret['secret'].source)
+            if secret['secret'].target is not None and secret['secret'].target.startswith('/'):
+                target = secret['secret'].target
+            else:
+                target = '{}/{}'.format(
+                    const.SECRETS_PATH,
+                    secret['secret'].target or secret['secret'].source)
             return VolumeSpec(secret['file'], target, 'ro')
             return VolumeSpec(secret['file'], target, 'ro')
 
 
         return [build_spec(secret) for secret in self.secrets]
         return [build_spec(secret) for secret in self.secrets]