mirrors/docker-etchosts
1
0
Fork 0
mirror of https://github.com/costela/docker-etchosts.git synced 2025-05-11 18:05:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

write only unique hosts

Browse source
This commit is contained in:
Grzegorz Sobczyk 2023-02-26 18:28:32 +01:00
parent 118e12bfe7
commit f985c1a728
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
docker.go
View file

@ -26,7 +26,7 @@ type dockerClientPinger interface {
Ping(context.Context) (types.Ping, error)
}
const dockerLabel string = "net.costela.docker-etchosts.extra_hosts";
const dockerLabel string = "net.costela.docker-etchosts.extra_hosts"
func getAllIPsToNames(client dockerClienter) (ipsToNamesMap, error) {
containers, err := client.ContainerList(context.Background(), types.ContainerListOptions{})
@ -93,21 +93,21 @@ func getIPsToNames(client dockerClienter, id string) (ipsToNamesMap, error) {
for _, host := range hosts {
matches, err := regexp.MatchString("^[a-zA-Z][a-zA-Z0-9.-]*[a-zA-Z0-9]$", host)
if err != nil {
log.Fatal(err)
}
if matches {
validHosts = append(validHosts, host)
} else {
log.Warnf("Skipping '%s' doas not seem a valid hostname.", host)
}
}
return validHosts
}
names = appendNames(names, strings.Trim(containerFull.Name, "/"))
for _, name := range netInfo.Aliases {
names = appendNames(names, name)
@ -115,33 +115,45 @@ func getIPsToNames(client dockerClienter, id string) (ipsToNamesMap, error) {
if label, ok := containerFull.Config.Labels[dockerLabel]; ok {
label = strings.TrimSpace(label)
if (strings.HasPrefix(label, "[")) {
if strings.HasPrefix(label, "[") {
var parsed []string
err := json.Unmarshal([]byte(label), &parsed)
if err != nil {
log.Errorf("error parsing JSON: %s", err)
}
names = append(names, validateHostname(parsed...)...)
} else if (strings.HasPrefix(label, `"`)) {
var parsed string;
} else if strings.HasPrefix(label, `"`) {
var parsed string
err := json.Unmarshal([]byte(label), &parsed)
if err != nil {
log.Errorf("error parsing JSON: %s", err)
}
names = append(names, validateHostname(parsed)...)
} else if (strings.HasPrefix(label, "{")) {
} else if strings.HasPrefix(label, "{") {
log.Errorf("JSON objects are not supported: %s", label)
} else {
names = append(names, validateHostname(label)...)
}
}
ipsToNames[netInfo.IPAddress] = names
ipsToNames[netInfo.IPAddress] = unique(names)
}
return ipsToNames, nil
}
func unique(slice []string) []string {
keys := make(map[string]bool)
list := []string{}
for _, entry := range slice {
if _, value := keys[entry]; !value {
keys[entry] = true
list = append(list, entry)
}
}
return list
}
func syncAndListenForEvents(client dockerClienter, config ConfigSpec) {
eventOpts := types.EventsOptions{