opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-14 01:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add --no-hostname option

Browse Source 
Fixes: https://github.com/containers/podman/issues/25002

Also add the ability to inspect containers for
UseImageHosts and UseImageHostname.

Finally fixed some bugs in handling of --no-hosts for Pods,
which I descovered.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2025-01-13 12:05:25 -05:00
parent 04e6488315
commit 6565bde6e8
35 changed files with 160 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container_config.go
View File

@ -286,10 +286,13 @@ type ContainerNetworkConfig struct {
// DNS options to be set in container resolv.conf
// With override options in host resolv if set
DNSOption []string `json:"dnsOption,omitempty"`
// UseImageHostname indicates that /etc/hostname should not be
// bind-mounted inside the container.
UseImageHostname bool `json:"useImageHostname"`
// UseImageHosts indicates that /etc/hosts should not be
// bind-mounted inside the container.
// Conflicts with HostAdd.
UseImageHosts bool
UseImageHosts bool `json:"useImageHosts"`
// BaseHostsFile is the base file to create the `/etc/hosts` file inside the container.
// This must either be an absolute path to a file on the host system, or one of the
// special flags `image` or `none`.
@ -472,6 +475,8 @@ type InfraInherit struct {
Volumes []*specgen.NamedVolume `json:"volumes,omitempty"`
ShmSize *int64 `json:"shm_size"`
ShmSizeSystemd *int64 `json:"shm_size_systemd"`
UseImageHosts bool `json:"use_image_hosts"`
UseImageHostname bool `json:"use_image_hostname"`
}
// IsDefaultShmSize determines if the user actually set the shm in the parent ctr or if it has been set to the default size