add secrets property to build section

Signed-off-by: Guillaume Lours <[email protected]>

Author: glours

loader/full-example.yml

@@ -15,6 +15,13 @@ services:
         - foo
         - bar
       labels: [FOO=BAR]
+      secrets:
+        - secret1
+        - source: secret2
+          target: my_secret
+          uid: '103'
+          gid: '103'
+          mode: 0440
 
 
     cap_add:

loader/full-struct_test.go

@@ -58,6 +58,18 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 				Network:    "foo",
 				CacheFrom:  []string{"foo", "bar"},
 				Labels:     map[string]string{"FOO": "BAR"},
+				Secrets: []types.ServiceSecretConfig{
+					{
+						Source: "secret1",
+					},
+					{
+						Source: "secret2",
+						Target: "my_secret",
+						UID:    "103",
+						GID:    "103",
+						Mode:   uint32Ptr(0440),
+					},
+				},
 			},
 			CapAdd:       []string{"ALL"},
 			CapDrop:      []string{"NET_ADMIN", "SYS_ADMIN"},
@@ -579,6 +591,13 @@ services:
       - bar
       network: foo
       target: foo
+      secrets:
+      - source: secret1
+      - source: secret2
+        target: my_secret
+        uid: "103"
+        gid: "103"
+        mode: 288
     cap_add:
     - ALL
     cap_drop:
@@ -1096,7 +1115,19 @@ func fullExampleJSON(workingDir, homeDir string) string {
           "bar"
         ],
         "network": "foo",
-        "target": "foo"
+        "target": "foo",
+        "secrets": [
+          {
+            "source": "secret1"
+          },
+          {
+            "source": "secret2",
+            "target": "my_secret",
+            "uid": "103",
+            "gid": "103",
+            "mode": 288
+          }
+        ]
       },
       "cap_add": [
         "ALL"

schema/compose-spec.json

@@ -99,7 +99,27 @@
                 "target": {"type": "string"},
                 "shm_size": {"type": ["integer", "string"]},
                 "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
-                "isolation": {"type": "string"}
+                "isolation": {"type": "string"},
+                "secrets": {
+                  "type": "array",
+                  "items": {
+                    "oneOf": [
+                      {"type": "string"},
+                      {
+                        "type": "object",
+                        "properties": {
+                          "source": {"type": "string"},
+                          "target": {"type": "string"},
+                          "uid": {"type": "string"},
+                          "gid": {"type": "string"},
+                          "mode": {"type": "number"}
+                        },
+                        "additionalProperties": false,
+                        "patternProperties": {"^x-": {}}
+                      }
+                    ]
+                  }
+                }
               },
               "additionalProperties": false,
               "patternProperties": {"^x-": {}}

types/types.go

@@ -302,6 +302,7 @@ type BuildConfig struct {
 	Isolation  string            `yaml:",omitempty" json:"isolation,omitempty"`
 	Network    string            `yaml:",omitempty" json:"network,omitempty"`
 	Target     string            `yaml:",omitempty" json:"target,omitempty"`
+	Secrets    []ServiceSecretConfig `yaml:",omitempty" json:"secrets,omitempty"`
 
 	Extensions map[string]interface{} `yaml:",inline" json:"-"`
 }