runservice: add privileged containers options
This commit is contained in:
parent
7d105f1232
commit
16ac6ada66
@ -70,6 +70,7 @@ type Container struct {
|
|||||||
Image string `yaml:"image,omitempty"`
|
Image string `yaml:"image,omitempty"`
|
||||||
Environment map[string]string `yaml:"environment,omitempty"`
|
Environment map[string]string `yaml:"environment,omitempty"`
|
||||||
User string `yaml:"user"`
|
User string `yaml:"user"`
|
||||||
|
Privileged bool `yaml:"privileged"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Pipeline struct {
|
type Pipeline struct {
|
||||||
|
@ -36,6 +36,7 @@ func genRuntime(c *config.Config, runtimeName string) *rstypes.Runtime {
|
|||||||
Image: cc.Image,
|
Image: cc.Image,
|
||||||
Environment: cc.Environment,
|
Environment: cc.Environment,
|
||||||
User: cc.User,
|
User: cc.User,
|
||||||
|
Privileged: cc.Privileged,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return &rstypes.Runtime{
|
return &rstypes.Runtime{
|
||||||
|
@ -150,6 +150,7 @@ func (d *DockerDriver) NewPod(ctx context.Context, podConfig *PodConfig) (Pod, e
|
|||||||
}, &container.HostConfig{
|
}, &container.HostConfig{
|
||||||
Binds: []string{fmt.Sprintf("%s:%s", d.initVolumeHostDir, podConfig.InitVolumeDir)},
|
Binds: []string{fmt.Sprintf("%s:%s", d.initVolumeHostDir, podConfig.InitVolumeDir)},
|
||||||
ReadonlyPaths: []string{fmt.Sprintf("%s:%s", d.initVolumeHostDir, podConfig.InitVolumeDir)},
|
ReadonlyPaths: []string{fmt.Sprintf("%s:%s", d.initVolumeHostDir, podConfig.InitVolumeDir)},
|
||||||
|
Privileged: containerConfig.Privileged,
|
||||||
}, nil, "")
|
}, nil, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -76,6 +76,7 @@ type ContainerConfig struct {
|
|||||||
WorkingDir string
|
WorkingDir string
|
||||||
Image string
|
Image string
|
||||||
User string
|
User string
|
||||||
|
Privileged bool
|
||||||
RegistryAuth string
|
RegistryAuth string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,6 +449,7 @@ func (e *Executor) executeTask(ctx context.Context, et *types.ExecutorTask) {
|
|||||||
Env: et.Containers[0].Environment,
|
Env: et.Containers[0].Environment,
|
||||||
WorkingDir: et.WorkingDir,
|
WorkingDir: et.WorkingDir,
|
||||||
User: et.Containers[0].User,
|
User: et.Containers[0].User,
|
||||||
|
Privileged: et.Containers[0].Privileged,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -387,7 +387,9 @@ type ExecutorTask struct {
|
|||||||
WorkingDir string `json:"working_dir,omitempty"`
|
WorkingDir string `json:"working_dir,omitempty"`
|
||||||
Shell string `json:"shell,omitempty"`
|
Shell string `json:"shell,omitempty"`
|
||||||
User string `json:"user,omitempty"`
|
User string `json:"user,omitempty"`
|
||||||
Steps []interface{} `json:"steps,omitempty"`
|
Privileged bool `yaml:"privileged"`
|
||||||
|
|
||||||
|
Steps []interface{} `json:"steps,omitempty"`
|
||||||
|
|
||||||
Status ExecutorTaskStatus `json:"status,omitempty"`
|
Status ExecutorTaskStatus `json:"status,omitempty"`
|
||||||
SetupError string `fail_reason:"setup_error,omitempty"`
|
SetupError string `fail_reason:"setup_error,omitempty"`
|
||||||
@ -422,6 +424,7 @@ type Container struct {
|
|||||||
Image string `json:"image,omitempty"`
|
Image string `json:"image,omitempty"`
|
||||||
Environment map[string]string `json:"environment,omitempty"`
|
Environment map[string]string `json:"environment,omitempty"`
|
||||||
User string `json:"user,omitempty"`
|
User string `json:"user,omitempty"`
|
||||||
|
Privileged bool `json:"privileged"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Workspace []WorkspaceLevel
|
type Workspace []WorkspaceLevel
|
||||||
|
Loading…
Reference in New Issue
Block a user