dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-11 09:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

use strings.Cut instead of strings.Split for parsing imageConfig.User

Browse Source 
Signed-off-by: Shingo Omura <everpeace@gmail.com>
(cherry picked from commit 50740a1a0c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Shingo Omura
2023-03-14 13:33:17 +09:00
committed by Sebastiaan van Stijn
parent eace671808
commit eea3440d89
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/sbserver/container_create_linux.go
View File

@@ -79,8 +79,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
} else if securityContext.GetRunAsUser() != nil {
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
} else if imageConfig.User != "" {
parts := strings.Split(imageConfig.User, ":")
userstr = parts[0]
userstr, _, _ = strings.Cut(imageConfig.User, ":")
}
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))

3
pkg/cri/server/container_create_linux.go
View File

@@ -372,8 +372,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
} else if securityContext.GetRunAsUser() != nil {
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
} else if imageConfig.User != "" {
parts := strings.Split(imageConfig.User, ":")
userstr = parts[0]
userstr, _, _ = strings.Cut(imageConfig.User, ":")
}
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))