chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added shm_size

Browse Source
This commit is contained in:
Brad Rydzewski
2019-10-26 11:33:52 -07:00
parent a319f263c9
commit 3c1ae23a1e
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/compiler/step.go
View File

@@ -34,6 +34,7 @@ func createStep(spec *resource.Pipeline, src *resource.Step) *engine.Step {
Pull: convertPullPolicy(src.Pull), Pull: convertPullPolicy(src.Pull),
User: src.User, User: src.User,
Secrets: convertSecretEnv(src.Environment), Secrets: convertSecretEnv(src.Environment),
ShmSize: int64(src.ShmSize),
WorkingDir: src.WorkingDir, WorkingDir: src.WorkingDir,
// //

2
engine/convert.go
View File

@@ -54,7 +54,7 @@ func toHostConfig(spec *Spec, step *Step) *container.HostConfig {
Type: "json-file", Type: "json-file",
}, },
Privileged: step.Privileged, Privileged: step.Privileged,
// TODO(bradrydzewski) set ShmSize ShmSize: step.ShmSize,
} }
// windows does not support privileged so we hard-code // windows does not support privileged so we hard-code
// this value to false. // this value to false.

3
engine/linter/linter.go
View File

@@ -115,6 +115,9 @@ func checkStep(step *resource.Step, trusted bool) error {
if trusted == false && len(step.Network) > 0 { if trusted == false && len(step.Network) > 0 {
return errors.New("linter: untrusted repositories cannot configure network_mode") return errors.New("linter: untrusted repositories cannot configure network_mode")
} }
if trusted == false && int(step.ShmSize) > 0 {
return errors.New("linter: untrusted repositories cannot configure shm_size")
}
for _, mount := range step.Volumes { for _, mount := range step.Volumes {
switch mount.Name { switch mount.Name {
case "workspace", "_workspace", "_docker_socket": case "workspace", "_workspace", "_docker_socket":

1
engine/resource/pipeline.go
View File

@@ -103,6 +103,7 @@ type (
Pull string `json:"pull,omitempty"` Pull string `json:"pull,omitempty"`
Settings map[string]*manifest.Parameter `json:"settings,omitempty"` Settings map[string]*manifest.Parameter `json:"settings,omitempty"`
Shell string `json:"shell,omitempty"` Shell string `json:"shell,omitempty"`
ShmSize manifest.BytesSize `json:"shm_size,omitempty"`
User string `json:"user,omitempty"` User string `json:"user,omitempty"`
Volumes []*VolumeMount `json:"volumes,omitempty"` Volumes []*VolumeMount `json:"volumes,omitempty"`
When manifest.Conditions `json:"when,omitempty"` When manifest.Conditions `json:"when,omitempty"`