mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-02 21:49:25 +00:00
Code Issues Projects Releases Wiki Activity

Support all backends for cli exec (#801)

Browse source
This commit is contained in:
Anbraten 2022-02-26 03:02:42 +01:00 committed by GitHub
parent 52d8097290
commit 1cc8122ec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cli/exec/exec.go
View file

@ -16,8 +16,8 @@ import (
"github.com/woodpecker-ci/woodpecker/cli/common" "github.com/woodpecker-ci/woodpecker/cli/common"
"github.com/woodpecker-ci/woodpecker/pipeline" "github.com/woodpecker-ci/woodpecker/pipeline"
"github.com/woodpecker-ci/woodpecker/pipeline/backend/docker" "github.com/woodpecker-ci/woodpecker/pipeline/backend"
backend "github.com/woodpecker-ci/woodpecker/pipeline/backend/types" backendTypes "github.com/woodpecker-ci/woodpecker/pipeline/backend/types"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend" "github.com/woodpecker-ci/woodpecker/pipeline/frontend"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/compiler" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/compiler"
@ -180,7 +180,12 @@ func execWithAxis(c *cli.Context, file, repoPath string, axis matrix.Axis) error
compiler.WithSecret(secrets...), compiler.WithSecret(secrets...),
compiler.WithEnviron(droneEnv), compiler.WithEnviron(droneEnv),
).Compile(conf) ).Compile(conf)
engine := docker.New()
engine, err := backend.FindEngine(c.String("backend-engine"))
if err != nil {
return err
}
if err = engine.Load(); err != nil { if err = engine.Load(); err != nil {
return err return err
} }
@ -273,7 +278,7 @@ func convertPathForWindows(path string) string {
return filepath.ToSlash(path) return filepath.ToSlash(path)
} }
var defaultLogger = pipeline.LogFunc(func(proc *backend.Step, rc multipart.Reader) error { var defaultLogger = pipeline.LogFunc(func(proc *backendTypes.Step, rc multipart.Reader) error {
part, err := rc.NextPart() part, err := rc.NextPart()
if err != nil { if err != nil {
return err return err

10
cli/exec/flags.go
View file

@ -46,10 +46,10 @@ var flags = []cli.Flag{
Usage: "external networks", Usage: "external networks",
}, },
&cli.StringFlag{ &cli.StringFlag{
EnvVars: []string{"WOODPECKER_DOCKER_PREFIX"}, EnvVars: []string{"WOODPECKER_PREFIX"},
Name: "prefix", Name: "prefix",
Value: "woodpecker", Value: "woodpecker",
Usage: "prefix containers created by woodpecker", Usage: "prefix used for containers, volumes, networks, ... created by woodpecker",
Hidden: true, Hidden: true,
}, },
&cli.StringSliceFlag{ &cli.StringSliceFlag{
@ -57,6 +57,12 @@ var flags = []cli.Flag{
Usage: "privileged plugins", Usage: "privileged plugins",
Value: cli.NewStringSlice(constant.PrivilegedPlugins...), Value: cli.NewStringSlice(constant.PrivilegedPlugins...),
}, },
&cli.StringFlag{
EnvVars: []string{"WOODPECKER_BACKEND"},
Name: "backend-engine",
Usage: "backend engine to run pipelines on",
Value: "auto-detect",
},
// //
// Please note the below flags should match the flags from // Please note the below flags should match the flags from