Merge pull request #3836 from chenzhiwei/hostname

Allow customizing pod hostname

4 files changed, 26 insertions, 2 deletions

diff --git a/libpod/options.go b/libpod/options.go
index 1e7877dac..d2a67e38c 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1497,6 +1497,24 @@ func WithPodName(name string) PodCreateOption {
 	}
 }
 
+// WithPodHostname sets the hostname of the pod.
+func WithPodHostname(hostname string) PodCreateOption {
+	return func(pod *Pod) error {
+		if pod.valid {
+			return define.ErrPodFinalized
+		}
+
+		// Check the hostname against a regex
+		if !nameRegex.MatchString(hostname) {
+			return regexError
+		}
+
+		pod.config.Hostname = hostname
+
+		return nil
+	}
+}
+
 // WithPodLabels sets the labels of a pod.
 func WithPodLabels(labels map[string]string) PodCreateOption {
 	return func(pod *Pod) error {
diff --git a/libpod/pod.go b/libpod/pod.go
index 60626bfd7..3b9bb9c60 100644
--- a/libpod/pod.go
+++ b/libpod/pod.go
@@ -36,6 +36,8 @@ type PodConfig struct {
 	// Namespace the pod is in
 	Namespace string `json:"namespace,omitempty"`
 
+	Hostname string `json:"hostname,omitempty"`
+
 	// Labels contains labels applied to the pod
 	Labels map[string]string `json:"labels"`
 	// CgroupParent contains the pod's CGroup parent
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 5387eb587..ad6662f03 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -31,8 +31,8 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID
 		return nil, err
 	}
 
-	// Set Pod hostname as Pod name
-	g.Config.Hostname = p.config.Name
+	// Set Pod hostname
+	g.Config.Hostname = p.config.Hostname
 
 	isRootless := rootless.IsRootless()
 
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go
index f38e6e7c1..073c5054d 100644
--- a/libpod/runtime_pod_linux.go
+++ b/libpod/runtime_pod_linux.go
@@ -52,6 +52,10 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (_ *Po
 		pod.config.Name = name
 	}
 
+	if pod.config.Hostname == "" {
+		pod.config.Hostname = pod.config.Name
+	}
+
 	// Allocate a lock for the pod
 	lock, err := r.lockManager.AllocateLock()
 	if err != nil {