Merge pull request #1126 from hashicorp/b-fix-label-type

Docker labels configuration should be of type "array" in schema
This commit is contained in:
iverberk 2016-04-26 00:24:09 +02:00
commit f1d2ceacb3
3 changed files with 10 additions and 1 deletions

View File

@ -176,7 +176,7 @@ func (d *DockerDriver) Validate(config map[string]interface{}) error {
Type: fields.TypeString,
},
"labels": &fields.FieldSchema{
Type: fields.TypeMap,
Type: fields.TypeArray,
},
"auth": &fields.FieldSchema{
Type: fields.TypeArray,

View File

@ -91,6 +91,11 @@ func TestParse(t *testing.T) {
User: "bob",
Config: map[string]interface{}{
"image": "hashicorp/binstore",
"labels": []map[string]interface{}{
map[string]interface{}{
"FOO": "bar",
},
},
},
Services: []*structs.Service{
{

View File

@ -47,6 +47,10 @@ job "binstore-storagelocker" {
config {
image = "hashicorp/binstore"
labels {
FOO = "bar"
}
}
logs {