mirror of
https://github.com/rancher/rke.git
synced 2025-09-01 15:06:23 +00:00
Revert "Do not rewrite SELinux labels on volume mounts"
This commit is contained in:
committed by
GitHub
parent
e0b892247f
commit
51a6b50a84
@@ -51,7 +51,6 @@ const (
|
||||
CleanerContainerName = "kube-cleaner"
|
||||
LogCleanerContainerName = "rke-log-cleaner"
|
||||
RKELogsPath = "/var/lib/rancher/rke/log"
|
||||
SELinuxLabel = "label=type:rke_container_t"
|
||||
|
||||
B2DOS = "Boot2Docker"
|
||||
B2DPrefixPath = "/mnt/sda1/rke"
|
||||
@@ -307,14 +306,11 @@ func buildCleanerConfig(host *Host, toCleanDirs []string, cleanerImage string) (
|
||||
}
|
||||
bindMounts := []string{}
|
||||
for _, vol := range toCleanDirs {
|
||||
bindMounts = append(bindMounts, fmt.Sprintf("%s:%s", vol, vol))
|
||||
bindMounts = append(bindMounts, fmt.Sprintf("%s:%s:z", vol, vol))
|
||||
}
|
||||
hostCfg := &container.HostConfig{
|
||||
Binds: bindMounts,
|
||||
}
|
||||
if IsDockerSELinuxEnabled(host) {
|
||||
hostCfg.SecurityOpt = append(hostCfg.SecurityOpt, SELinuxLabel)
|
||||
}
|
||||
return imageCfg, hostCfg
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user