Simplify handling of host_dns

slonopotamus · olljanat · commit 484162b948d5 · 2025-02-11T21:03:43.000Z
diff --git a/containerd/containerd.go b/containerd/containerd.go
@@ -276,8 +276,7 @@ func (d *Driver) createContainer(containerConfig *ContainerConfig, config *TaskC
 
 	// Setup host DNS (/etc/resolv.conf) into the container.
 	if config.HostDNS {
-		dnsMount := buildMountpoint("bind", "/etc/resolv.conf", "/etc/resolv.conf", []string{"rbind", "ro"})
-		mounts = append(mounts, dnsMount)
+		opts = append(opts, oci.WithHostResolvconf)
 	}
 
 	// Setup "/secrets" (NOMAD_SECRETS_DIR) in the container.

Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,7 @@ func (d Driver) createContainer(containerConfig ContainerConfig, config *TaskC`
`276`	`276`
`277`	`277`	`// Setup host DNS (/etc/resolv.conf) into the container.`
`278`	`278`	`if config.HostDNS {`
`279`		`- dnsMount := buildMountpoint("bind", "/etc/resolv.conf", "/etc/resolv.conf", []string{"rbind", "ro"})`
`280`		`- mounts = append(mounts, dnsMount)`
	`279`	`+ opts = append(opts, oci.WithHostResolvconf)`
`281`	`280`	`}`
`282`	`281`
`283`	`282`	`// Setup "/secrets" (NOMAD_SECRETS_DIR) in the container.`