github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7607 from jess-sol/main

Browse Source 
Support default hosts.toml configuration
This commit is contained in:
Kazuyoshi Kato
2022-11-04 10:22:00 -07:00
committed by GitHub
parent b2a01eedf4 8b1b81eefd
commit e306680f44
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
remotes/docker/config/config_unix.go
View File

@@ -24,16 +24,18 @@ import (
"path/filepath"
)
func hostPaths(root, host string) []string {
func hostPaths(root, host string) (hosts []string) {
ch := hostDirectory(host)
if ch == host {
return []string{filepath.Join(root, host)}
if ch != host {
hosts = append(hosts, filepath.Join(root, ch))
}
return []string{
filepath.Join(root, ch),
hosts = append(hosts,
filepath.Join(root, host),
}
filepath.Join(root, "_default"),
)
return
}
func rootSystemPool() (*x509.CertPool, error) {

14
remotes/docker/config/config_windows.go
View File

@@ -22,16 +22,18 @@ import (
"strings"
)
func hostPaths(root, host string) []string {
func hostPaths(root, host string) (hosts []string) {
ch := hostDirectory(host)
if ch == host {
return []string{filepath.Join(root, host)}
if ch != host {
hosts = append(hosts, filepath.Join(root, strings.Replace(ch, ":", "", -1)))
}
return []string{
filepath.Join(root, strings.Replace(ch, ":", "", -1)),
hosts = append(hosts,
filepath.Join(root, strings.Replace(host, ":", "", -1)),
}
filepath.Join(root, "_default"),
)
return
}
func rootSystemPool() (*x509.CertPool, error) {