Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure cli exec has by default not the same prefix #4132

Merged
merged 10 commits into from
Sep 24, 2024
Merged

Ensure cli exec has by default not the same prefix #4132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b0dccf6
ensure cli exec has by default not the same prefix
6543 Sep 20, 2024
fe1c874
docu
6543 Sep 20, 2024
065f814
docu (2)
6543 Sep 20, 2024
c784a0c
Merge branch 'main' into cli-exec-add-random-prefix
6543 Sep 21, 2024
f5eb8a6
Merge branch 'main' into cli-exec-add-random-prefix
6543 Sep 22, 2024
7ce8edb
Merge branch 'main' into cli-exec-add-random-prefix
6543 Sep 23, 2024
5288107
Update cli/exec/flags.go
6543 Sep 24, 2024
ec28fc7
Merge branch 'main' into cli-exec-add-random-prefix
6543 Sep 24, 2024
c2be418
Merge branch 'main' into cli-exec-add-random-prefix
6543 Sep 24, 2024
5dbe124
remove WOODPECKER_PREFIX and hardcode behaviour
6543 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cli/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"strings"

"github.com/drone/envsubst"
"github.com/oklog/ulid/v2"
"github.com/rs/zerolog/log"
"github.com/urfave/cli/v3"

Expand Down Expand Up @@ -170,6 +171,9 @@ func execWithAxis(ctx context.Context, c *cli.Command, file, repoPath string, ax
return err
}

// emulate server behavior https://github.com/woodpecker-ci/woodpecker/blob/eebaa10d104cbc3fa7ce4c0e344b0b7978405135/server/pipeline/stepbuilder/stepBuilder.go#L289-L295
prefix := "wp_" + ulid.Make().String()

// configure volumes for local execution
volumes := c.StringSlice("volumes")
if c.Bool("local") {
Expand All @@ -184,7 +188,7 @@ func execWithAxis(ctx context.Context, c *cli.Command, file, repoPath string, ax
workspacePath = c.String("workspace-path")
}

volumes = append(volumes, c.String("prefix")+"_default:"+workspaceBase)
volumes = append(volumes, prefix+"_default:"+workspaceBase)
volumes = append(volumes, repoPath+":"+path.Join(workspaceBase, workspacePath))
}

Expand Down Expand Up @@ -221,9 +225,7 @@ func execWithAxis(ctx context.Context, c *cli.Command, file, repoPath string, ax
compiler.WithNetworks(
c.StringSlice("network")...,
),
compiler.WithPrefix(
c.String("prefix"),
),
compiler.WithPrefix(prefix),
compiler.WithProxy(compiler.ProxyOptions{
NoProxy: c.String("backend-no-proxy"),
HTTPProxy: c.String("backend-http-proxy"),
Expand Down
7 changes: 0 additions & 7 deletions cli/exec/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ var flags = []cli.Flag{
Name: "network",
Usage: "external networks",
},
&cli.StringFlag{
Sources: cli.EnvVars("WOODPECKER_PREFIX"),
Name: "prefix",
Value: "woodpecker",
Usage: "prefix used for containers, volumes, networks, ... created by woodpecker",
Hidden: true,
},
&cli.StringSliceFlag{
Sources: cli.EnvVars("WOODPECKER_PLUGINS_PRIVILEGED"),
Name: "plugins-privileged",
Expand Down