Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion loader/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,18 @@ func toServicePortConfigsSlice(dst reflect.Value, m map[interface{}]interface{})
for _, v := range m {
s = append(s, v.(types.ServicePortConfig))
}
sort.Slice(s, func(i, j int) bool { return s[i].Published < s[j].Published })
sort.Slice(s, func(i, j int) bool {
if s[i].Target != s[j].Target {
return s[i].Target < s[j].Target
}
if s[i].Published != s[j].Published {
return s[i].Published < s[j].Published
}
if s[i].HostIP != s[j].HostIP {
return s[i].HostIP < s[j].HostIP
}
return s[i].Protocol < s[j].Protocol
})
dst.Set(reflect.ValueOf(s))
return nil
}
Expand Down
7 changes: 0 additions & 7 deletions loader/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ func checkConsistency(project *types.Project) error {
}
}

if strings.HasPrefix(s.NetworkMode, types.ContainerPrefix) {
containerName := s.NetworkMode[len(types.ContainerPrefix):]
if _, err := project.GetByContainerName(containerName); err != nil {
return fmt.Errorf("service with container_name %q not found for network_mode 'container:%s'", containerName, containerName)
}
}

for _, volume := range s.Volumes {
switch volume.Type {
case types.VolumeTypeVolume:
Expand Down
18 changes: 0 additions & 18 deletions loader/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,4 @@ func TestValidateNetworkMode(t *testing.T) {
err := checkConsistency(project)
assert.NilError(t, err)
})

t.Run("network_mode container fail", func(t *testing.T) {
project := &types.Project{
Services: types.Services([]types.ServiceConfig{
{
Name: "myservice1",
Image: "scratch",
},
{
Name: "myservice2",
Image: "scratch",
NetworkMode: "container:nonexistentcontainer",
},
}),
}
err := checkConsistency(project)
assert.Error(t, err, `service with container_name "nonexistentcontainer" not found for network_mode 'container:nonexistentcontainer'`)
})
}
18 changes: 0 additions & 18 deletions types/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,6 @@ func (p Project) ConfigNames() []string {
return names
}

func (p Project) GetByContainerName(names ...string) (Services, error) {
if len(names) == 0 {
return p.Services, nil
}
services := Services{}
outLoop:
for _, name := range names {
for _, s := range p.Services {
if name == s.ContainerName {
services = append(services, s)
continue outLoop
}
}
return nil, fmt.Errorf("service with container_name %q could not be found", name)
}
return services, nil
}

// GetServices retrieve services by names, or return all services if no name specified
func (p Project) GetServices(names ...string) (Services, error) {
if len(names) == 0 {
Expand Down