Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker compose interpolation format error now includes a hint on escaping $ characters. 

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
This commit is contained in:
Arash Deshmeh 2017-02-18 00:29:51 -05:00
parent 5b67f20a91
commit 3581bec442
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/interpolation/interpolation.go
View File

@ -39,7 +39,7 @@ func interpolateSectionItem(
interpolatedValue, err := recursiveInterpolate(value, mapping) interpolatedValue, err := recursiveInterpolate(value, mapping)
if err != nil { if err != nil {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"Invalid interpolation format for %#v option in %s %#v: %#v", "Invalid interpolation format for %#v option in %s %#v: %#v. You may need to escape any $ with another $.",
key, section, name, err.Template, key, section, name, err.Template,
) )
} }

2
compose/interpolation/interpolation_test.go
View File

@ -55,5 +55,5 @@ func TestInvalidInterpolation(t *testing.T) {
}, },
} }
_, err := Interpolate(services, "service", defaultMapping) _, err := Interpolate(services, "service", defaultMapping)
assert.EqualError(t, err, `Invalid interpolation format for "image" option in service "servicea": "${"`) assert.EqualError(t, err, `Invalid interpolation format for "image" option in service "servicea": "${". You may need to escape any $ with another $.`)
} }