Add support for template_driver in composefiles

This maps the `--template-driver` flag on secret and config creation. Signed-off-by: Vincent Demeester <[email protected]>
docker · May 31, 2018 · 505668f · 505668f
1 parent a8ee42a
commit 505668f
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 44 deletions.
diff --git a/cli/compose/convert/compose.go b/cli/compose/convert/compose.go
@@ -110,7 +110,13 @@ func Secrets(namespace Namespace, secrets map[string]composetypes.SecretConfig)
 		if err != nil {
 			return nil, err
 		}
-		result = append(result, swarm.SecretSpec{Annotations: obj.Annotations, Data: obj.Data})
+		spec := swarm.SecretSpec{Annotations: obj.Annotations, Data: obj.Data}
+		if secret.TemplateDriver != "" {
+			spec.Templating = &swarm.Driver{
+				Name: secret.TemplateDriver,
+			}
+		}
+		result = append(result, spec)
 	}
 	return result, nil
 }
@@ -127,7 +133,13 @@ func Configs(namespace Namespace, configs map[string]composetypes.ConfigObjConfi
 		if err != nil {
 			return nil, err
 		}
-		result = append(result, swarm.ConfigSpec{Annotations: obj.Annotations, Data: obj.Data})
+		spec := swarm.ConfigSpec{Annotations: obj.Annotations, Data: obj.Data}
+		if config.TemplateDriver != "" {
+			spec.Templating = &swarm.Driver{
+				Name: config.TemplateDriver,
+			}
+		}
+		result = append(result, spec)
 	}
 	return result, nil
 }

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.7.json b/cli/compose/schema/data/config_schema_v3.7.json
@@ -528,7 +528,8 @@
             "name": {"type": "string"}
           }
         },
-        "labels": {"$ref": "#/definitions/list_or_dict"}
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "template_driver": {"type": "string"}
       },
       "additionalProperties": false
     },
@@ -545,7 +546,8 @@
             "name": {"type": "string"}
           }
         },
-        "labels": {"$ref": "#/definitions/list_or_dict"}
+        "labels": {"$ref": "#/definitions/list_or_dict"},
+        "template_driver": {"type": "string"}
       },
       "additionalProperties": false
     },

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -408,10 +408,11 @@ type CredentialSpecConfig struct {
 
 // FileObjectConfig is a config type for a file used by a service
 type FileObjectConfig struct {
-	Name     string   `yaml:",omitempty"`
-	File     string   `yaml:",omitempty"`
-	External External `yaml:",omitempty"`
-	Labels   Labels   `yaml:",omitempty"`
+	Name           string   `yaml:",omitempty"`
+	File           string   `yaml:",omitempty"`
+	External       External `yaml:",omitempty"`
+	Labels         Labels   `yaml:",omitempty"`
+	TemplateDriver string   `mapstructure:"template_driver" yaml:"template_driver,omitempty"`
 }
 
 // SecretConfig for a secret