opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 23:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16440 from n1hility/fix-registry-search

Browse Source 
Use single unqualified search registry on Windows
This commit is contained in:
OpenShift Merge Robot
2022-11-08 16:15:03 -05:00
committed by GitHub
parent d720440d78 85ae935afa
commit 757fdca77b
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/machine/wsl/machine.go
View File

@ -36,7 +36,7 @@ var (
const ( const (
ErrorSuccessRebootInitiated = 1641 ErrorSuccessRebootInitiated = 1641
ErrorSuccessRebootRequired = 3010 ErrorSuccessRebootRequired = 3010
currentMachineVersion = 2 currentMachineVersion = 3
) )
const containersConf = `[containers] const containersConf = `[containers]
@ -45,6 +45,9 @@ const containersConf = `[containers]
cgroup_manager = "cgroupfs" cgroup_manager = "cgroupfs"
` `
const registriesConf = `unqualified-search-registries=["docker.io"]
`
const appendPort = `grep -q Port\ %d /etc/ssh/sshd_config || echo Port %d >> /etc/ssh/sshd_config` const appendPort = `grep -q Port\ %d /etc/ssh/sshd_config || echo Port %d >> /etc/ssh/sshd_config`
const configServices = `ln -fs /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service const configServices = `ln -fs /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
@ -314,6 +317,11 @@ func (v *MachineVM) migrateMachine(configPath string) error {
return err return err
} }
// Update older machines missing unqualified search config
if err := configureRegistries(v, toDist(v.Name)); err != nil {
return err
}
v.Version = currentMachineVersion v.Version = currentMachineVersion
return v.writeConfig() return v.writeConfig()
} }
@ -554,6 +562,10 @@ func configureSystem(v *MachineVM, dist string) error {
return fmt.Errorf("could not create containers.conf for guest OS: %w", err) return fmt.Errorf("could not create containers.conf for guest OS: %w", err)
} }
if err := configureRegistries(v, dist); err != nil {
return err
}
if err := wslInvoke(dist, "sh", "-c", "echo wsl > /etc/containers/podman-machine"); err != nil { if err := wslInvoke(dist, "sh", "-c", "echo wsl > /etc/containers/podman-machine"); err != nil {
return fmt.Errorf("could not create podman-machine file for guest OS: %w", err) return fmt.Errorf("could not create podman-machine file for guest OS: %w", err)
} }
@ -608,6 +620,15 @@ func enableUserLinger(v *MachineVM, dist string) error {
return nil return nil
} }
func configureRegistries(v *MachineVM, dist string) error {
cmd := "cat > /etc/containers/registries.conf.d/999-podman-machine.conf"
if err := wslPipe(registriesConf, dist, "sh", "-c", cmd); err != nil {
return fmt.Errorf("could not configure registries on guest OS: %w", err)
}
return nil
}
func installScripts(dist string) error { func installScripts(dist string) error {
if err := wslPipe(enterns, dist, "sh", "-c", if err := wslPipe(enterns, dist, "sh", "-c",
"cat > /usr/local/bin/enterns; chmod 755 /usr/local/bin/enterns"); err != nil { "cat > /usr/local/bin/enterns; chmod 755 /usr/local/bin/enterns"); err != nil {