Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle SERVICE_<port>_<type>_<metadata> encodings #668

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle SERVICE_<port>_<type>_<metadata> encodings #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bridge/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func (b *Bridge) newService(port ServicePort, isgroup bool) *Service {
port.HostIP = b.config.HostIp
}

metadata, metadataFromPort := serviceMetaData(container.Config, port.ExposedPort)
metadata, metadataFromPort := serviceMetaData(container.Config, port)

ignore := mapDefault(metadata, "ignore", "")
if ignore != "" {
Expand Down
23 changes: 18 additions & 5 deletions bridge/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func combineTags(tagParts ...string) []string {
return tags
}

func serviceMetaData(config *dockerapi.Config, port string) (map[string]string, map[string]bool) {
func serviceMetaData(config *dockerapi.Config, port ServicePort) (map[string]string, map[string]bool) {
meta := config.Env
for k, v := range config.Labels {
meta = append(meta, k+"="+v)
Expand All @@ -68,15 +68,28 @@ func serviceMetaData(config *dockerapi.Config, port string) (map[string]string,
if metadataFromPort[key] {
continue
}
portkey := strings.SplitN(key, "_", 2)
portkey := strings.Split(key, "_")
_, err := strconv.Atoi(portkey[0])
if err == nil && len(portkey) > 1 {
if portkey[0] != port {
if portkey[0] != port.ExposedPort {
continue
}
metadata[portkey[1]] = kvp[1]
metadataFromPort[portkey[1]] = true

// SERVICE_<port>_<type>_<metadata> encodings
if len(portkey) > 2 {
if portkey[1] != port.PortType {
continue
}

metadata[portkey[2]] = kvp[1]
metadataFromPort[portkey[2]] = true
} else {
// SERVICE_<port>_<metadata> encodings
metadata[portkey[1]] = kvp[1]
metadataFromPort[portkey[1]] = true
}
} else {
// SERVICE_<metadata> encodings
metadata[key] = kvp[1]
}
}
Expand Down