mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
libct: initContainer: rename Id -> ID
Since the next commit is going to touch this structure, our CI (lint-extra) is about to complain about improperly named field: > Warning: var-naming: struct field ContainerId should be ContainerID (revive) Make it happy. Brought to use by gopls rename. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
@@ -665,7 +665,7 @@ func (c *linuxContainer) newInitConfig(process *Process) *initConfig {
|
||||
Cwd: process.Cwd,
|
||||
Capabilities: process.Capabilities,
|
||||
PassedFilesCount: len(process.ExtraFiles),
|
||||
ContainerId: c.ID(),
|
||||
ContainerID: c.ID(),
|
||||
NoNewPrivileges: c.config.NoNewPrivileges,
|
||||
RootlessEUID: c.config.RootlessEUID,
|
||||
RootlessCgroups: c.config.RootlessCgroups,
|
||||
|
||||
@@ -60,7 +60,7 @@ type initConfig struct {
|
||||
Config *configs.Config `json:"config"`
|
||||
Networks []*network `json:"network"`
|
||||
PassedFilesCount int `json:"passed_files_count"`
|
||||
ContainerId string `json:"containerid"`
|
||||
ContainerID string `json:"containerid"`
|
||||
Rlimits []configs.Rlimit `json:"rlimits"`
|
||||
CreateConsole bool `json:"create_console"`
|
||||
ConsoleWidth uint16 `json:"console_width"`
|
||||
|
||||
@@ -192,7 +192,7 @@ func (p *setnsProcess) start() (retErr error) {
|
||||
Metadata: p.config.Config.Seccomp.ListenerMetadata,
|
||||
State: specs.State{
|
||||
Version: specs.Version,
|
||||
ID: p.config.ContainerId,
|
||||
ID: p.config.ContainerID,
|
||||
Status: specs.StateRunning,
|
||||
Pid: p.initProcessPid,
|
||||
Bundle: bundle,
|
||||
|
||||
@@ -26,7 +26,7 @@ type linuxSetnsInit struct {
|
||||
}
|
||||
|
||||
func (l *linuxSetnsInit) getSessionRingName() string {
|
||||
return "_ses." + l.config.ContainerId
|
||||
return "_ses." + l.config.ContainerID
|
||||
}
|
||||
|
||||
func (l *linuxSetnsInit) Init() error {
|
||||
|
||||
@@ -42,7 +42,7 @@ func (l *linuxStandardInit) getSessionRingParams() (string, uint32, uint32) {
|
||||
|
||||
// Create a unique per session container name that we can join in setns;
|
||||
// However, other containers can also join it.
|
||||
return "_ses." + l.config.ContainerId, 0xffffffff, newperms
|
||||
return "_ses." + l.config.ContainerID, 0xffffffff, newperms
|
||||
}
|
||||
|
||||
func (l *linuxStandardInit) Init() error {
|
||||
|
||||
Reference in New Issue
Block a user