tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #463 from docker/compose_labels_error 

Explicit error message saying we don’t support labels in compose file
This commit is contained in:
Guillaume Tardif 2020-08-12 13:51:32 +02:00 committed by GitHub
parent e93da5cf5e 8fb16cea63
commit abd363d641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aci/convert/convert.go
View File

@ -95,6 +95,9 @@ func ToContainerGroup(aciContext store.AciContext, p types.Project) (containerin
if err != nil {
return containerinstance.ContainerGroup{}, err
}
if service.Labels != nil && len(service.Labels) > 0 {
return containerinstance.ContainerGroup{}, errors.New("ACI integration does not support labels in compose applications")
}
if service.Ports != nil {
var containerPorts []containerinstance.ContainerPort
for _, portConfig := range service.Ports {

17
aci/convert/convert_test.go
View File

@ -235,6 +235,23 @@ func TestComposeInconsistentMultiContainerRestartPolicy(t *testing.T) {
assert.Error(t, err, "ACI integration does not support specifying different restart policies on containers in the same compose application")
}
func TestLabelsErrorMessage(t *testing.T) {
project := types.Project{
Services: []types.ServiceConfig{
{
Name: "service1",
Image: "image1",
Labels: map[string]string{
"label1": "value1",
},
},
},
}
_, err := ToContainerGroup(convertCtx, project)
assert.Error(t, err, "ACI integration does not support labels in compose applications")
}
func TestComposeSingleContainerGroupToContainerDefaultRestartPolicy(t *testing.T) {
project := types.Project{
Services: []types.ServiceConfig{