rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-27 02:48:45 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2573 from superseb/selinux_dockerinfo

Browse Source 
Update SecurityOptions format for Docker API
This commit is contained in:
Sebastiaan van Steenis 2021-06-11 18:07:50 +02:00 committed by GitHub
commit 313f029722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/hosts.go
View File

@ -473,7 +473,9 @@ func GetInternalAddressForHosts(hostList []*Host) []string {
func IsDockerSELinuxEnabled(host *Host) bool { func IsDockerSELinuxEnabled(host *Host) bool {
for _, securityOpt := range host.DockerInfo.SecurityOptions { for _, securityOpt := range host.DockerInfo.SecurityOptions {
if securityOpt == "selinux" { logrus.Tracef("IsDockerSELinuxEnabled: securityOpt found: [%s]", securityOpt)
// name=selinux was the value returned after removing statically set Docker API version 1.24
if securityOpt == "selinux" || securityOpt == "name=selinux" {
logrus.Debugf("Host [%s] has SELinux enabled in Docker", host.Address) logrus.Debugf("Host [%s] has SELinux enabled in Docker", host.Address)
return true return true
} }