mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-23 10:21:00 +00:00
Code Issues Projects Releases Wiki Activity

add in validation for shm size, run go fmt on util.go

Browse source
This commit is contained in:
Oliver Marks 2016-10-07 22:18:46 +01:00
parent f478c8eeb6
commit 9d5e17ee92
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/docker/util.go
View file

@ -22,7 +22,7 @@ func toContainerConfig(c *yaml.Container) *dockerclient.ContainerConfig {
Privileged: c.Privileged, Privileged: c.Privileged,
NetworkMode: c.Network, NetworkMode: c.Network,
Memory: c.MemLimit, Memory: c.MemLimit,
ShmSize: c.ShmSize, ShmSize: c.ShmSize,
CpuShares: c.CPUShares, CpuShares: c.CPUShares,
CpuQuota: c.CPUQuota, CpuQuota: c.CPUQuota,
CpusetCpus: c.CPUSet, CpusetCpus: c.CPUSet,

3
yaml/transform/validate.go
View file

@ -51,6 +51,9 @@ func CheckTrusted(c *yaml.Container) error {
if c.Privileged { if c.Privileged {
return fmt.Errorf("Insufficient privileges to use privileged mode") return fmt.Errorf("Insufficient privileges to use privileged mode")
} }
if c.ShmSize != 0 {
return fmt.Errorf("Insufficient privileges to override shm_size")
}
if len(c.DNS) != 0 { if len(c.DNS) != 0 {
return fmt.Errorf("Insufficient privileges to use custom dns") return fmt.Errorf("Insufficient privileges to use custom dns")
} }