You've already forked woodpecker
mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-11-23 21:44:44 +02:00
Move docker specific volume & network settings into backend code (#1956)
... if we want to make them be changed ... it should be an agent-backend-option
This commit is contained in:
@@ -3,7 +3,6 @@ package compiler
|
||||
import (
|
||||
"fmt"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
backend_types "github.com/woodpecker-ci/woodpecker/pipeline/backend/types"
|
||||
"github.com/woodpecker-ci/woodpecker/pipeline/frontend/metadata"
|
||||
@@ -11,17 +10,9 @@ import (
|
||||
"github.com/woodpecker-ci/woodpecker/shared/constant"
|
||||
)
|
||||
|
||||
// TODO(bradrydzewski) compiler should handle user-defined volumes from YAML
|
||||
// TODO(bradrydzewski) compiler should handle user-defined networks from YAML
|
||||
|
||||
const (
|
||||
windowsPrefix = "windows/"
|
||||
|
||||
defaultCloneName = "clone"
|
||||
|
||||
networkDriverNAT = "nat"
|
||||
networkDriverBridge = "bridge"
|
||||
|
||||
nameServices = "services"
|
||||
namePipeline = "pipeline"
|
||||
)
|
||||
@@ -114,22 +105,13 @@ func (c *Compiler) Compile(conf *yaml_types.Workflow) (*backend_types.Config, er
|
||||
|
||||
// create a default volume
|
||||
config.Volumes = append(config.Volumes, &backend_types.Volume{
|
||||
Name: fmt.Sprintf("%s_default", c.prefix),
|
||||
Driver: "local",
|
||||
Name: fmt.Sprintf("%s_default", c.prefix),
|
||||
})
|
||||
|
||||
// create a default network
|
||||
if strings.HasPrefix(c.metadata.Sys.Platform, windowsPrefix) {
|
||||
config.Networks = append(config.Networks, &backend_types.Network{
|
||||
Name: fmt.Sprintf("%s_default", c.prefix),
|
||||
Driver: networkDriverNAT,
|
||||
})
|
||||
} else {
|
||||
config.Networks = append(config.Networks, &backend_types.Network{
|
||||
Name: fmt.Sprintf("%s_default", c.prefix),
|
||||
Driver: networkDriverBridge,
|
||||
})
|
||||
}
|
||||
config.Networks = append(config.Networks, &backend_types.Network{
|
||||
Name: fmt.Sprintf("%s_default", c.prefix),
|
||||
})
|
||||
|
||||
// create secrets for mask
|
||||
for _, sec := range c.secrets {
|
||||
|
||||
Reference in New Issue
Block a user