mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-26 03:41:01 +00:00
remove undocumented docker specific option (#1825)
This commit is contained in:
parent
ea895baf83
commit
f81b447638
5 changed files with 0 additions and 8 deletions
|
@ -30,7 +30,6 @@ import (
|
|||
func toConfig(step *types.Step) *container.Config {
|
||||
config := &container.Config{
|
||||
Image: step.Image,
|
||||
Labels: step.Labels,
|
||||
WorkingDir: step.WorkingDir,
|
||||
AttachStdout: true,
|
||||
AttachStderr: true,
|
||||
|
|
|
@ -10,7 +10,6 @@ type Step struct {
|
|||
Privileged bool `json:"privileged,omitempty"`
|
||||
WorkingDir string `json:"working_dir,omitempty"`
|
||||
Environment map[string]string `json:"environment,omitempty"`
|
||||
Labels map[string]string `json:"labels,omitempty"`
|
||||
Entrypoint []string `json:"entrypoint,omitempty"`
|
||||
Commands []string `json:"commands,omitempty"`
|
||||
ExtraHosts []string `json:"extra_hosts,omitempty"`
|
||||
|
|
|
@ -164,7 +164,6 @@ func (c *Compiler) createProcess(name string, container *yaml.Container, section
|
|||
Privileged: privileged,
|
||||
WorkingDir: workingdir,
|
||||
Environment: environment,
|
||||
Labels: container.Labels,
|
||||
Commands: container.Commands,
|
||||
ExtraHosts: container.ExtraHosts,
|
||||
Volumes: volumes,
|
||||
|
|
|
@ -59,7 +59,6 @@ type (
|
|||
Image string `yaml:"image,omitempty"`
|
||||
Failure string `yaml:"failure,omitempty"`
|
||||
Isolation string `yaml:"isolation,omitempty"`
|
||||
Labels types.SliceorMap `yaml:"labels,omitempty"`
|
||||
MemLimit types.MemStringorInt `yaml:"mem_limit,omitempty"`
|
||||
MemSwapLimit types.MemStringorInt `yaml:"memswap_limit,omitempty"`
|
||||
MemSwappiness types.MemStringorInt `yaml:"mem_swappiness,omitempty"`
|
||||
|
|
|
@ -44,9 +44,6 @@ networks:
|
|||
- other-network
|
||||
pull: true
|
||||
privileged: true
|
||||
labels:
|
||||
com.example.type: build
|
||||
com.example.team: frontend
|
||||
shm_size: 1kb
|
||||
mem_limit: 1kb
|
||||
memswap_limit: 1kb
|
||||
|
@ -87,7 +84,6 @@ func TestUnmarshalContainer(t *testing.T) {
|
|||
ExtraHosts: []string{"somehost:162.242.195.82", "otherhost:50.31.209.229"},
|
||||
Image: "golang:latest",
|
||||
Isolation: "hyperv",
|
||||
Labels: types.SliceorMap{"com.example.type": "build", "com.example.team": "frontend"},
|
||||
MemLimit: types.MemStringorInt(1024),
|
||||
MemSwapLimit: types.MemStringorInt(1024),
|
||||
MemSwappiness: types.MemStringorInt(1024),
|
||||
|
|
Loading…
Reference in a new issue