github/wp-docker-buildx
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-22 00:00:40 +00:00
Code Issues Releases Activity

fix: fix secrets format (#285)

Browse Source
This commit is contained in:
Grégoire Joncour 2023-06-29 21:16:20 +02:00 committed by GitHub
parent c7c3ad6942
commit 89db4c201e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_docs/content/_index.md
View File

@ -112,7 +112,8 @@ steps:
from_secret: secure_token from_secret: secure_token
settings: settings:
secrets: secrets:
- "id=raw_file_secret,src=file.txt" - "id=raw_file_secret\\\\,src=file.txt"
- 'id=other_raw_file_secret\\,src=other_file.txt'
- "id=SECRET_TOKEN" - "id=SECRET_TOKEN"
``` ```

4
cmd/drone-docker-buildx/config.go
View File

@ -321,11 +321,11 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
Destination: &settings.Build.SBOM, Destination: &settings.Build.SBOM,
Category: category, Category: category,
}, },
&cli.StringSliceFlag{ &cli.GenericFlag{
Name: "secrets", Name: "secrets",
EnvVars: []string{"PLUGIN_SECRETS"}, EnvVars: []string{"PLUGIN_SECRETS"},
Usage: "exposes secrets to the build", Usage: "exposes secrets to the build",
Destination: &settings.Build.Secrets, Value: &drone.StringSliceFlag{},
Category: category, Category: category,
}, },
} }

7
cmd/drone-docker-buildx/main.go
View File

@ -57,6 +57,13 @@ func run(settings *plugin.Settings) cli.ActionFunc {
settings.Build.CacheFrom = cacheFrom.Get() settings.Build.CacheFrom = cacheFrom.Get()
secrets, ok := ctx.Generic("secrets").(*drone.StringSliceFlag)
if !ok {
return fmt.Errorf("%w: failed to read secrets input", ErrTypeAssertionFailed)
}
settings.Build.Secrets = secrets.Get()
plugin := plugin.New( plugin := plugin.New(
*settings, *settings,
urfave.PipelineFromContext(ctx), urfave.PipelineFromContext(ctx),

2
plugin/docker.go
View File

@ -160,7 +160,7 @@ func commandBuild(build Build, dryrun bool) *execabs.Cmd {
args = append(args, "--sbom", build.SBOM) args = append(args, "--sbom", build.SBOM)
} }
for _, secret := range build.Secrets.Value() { for _, secret := range build.Secrets {
args = append(args, "--secret", secret) args = append(args, "--secret", secret)
} }

2
plugin/impl.go
View File

@ -65,7 +65,7 @@ type Build struct {
Labels cli.StringSlice // Docker build labels Labels cli.StringSlice // Docker build labels
Provenance string // Docker build provenance attestation Provenance string // Docker build provenance attestation
SBOM string // Docker build sbom attestation SBOM string // Docker build sbom attestation
Secrets cli.StringSlice // Docker build secrets Secrets []string // Docker build secrets
} }
// Settings for the Plugin. // Settings for the Plugin.