Skip to content

feat: allow build secrets args to be passed in cli #21

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

Open
thpiron wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow build secrets args to be passed in cli #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions v2/cli_build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package main
import (
"context"
"flag"
"fmt"
"os"
"slices"
"strings"

"github.com/discourse/launcher/v2/config"
Expand Down Expand Up @@ -53,6 +55,9 @@ func (r *DockerBuildCmd) Run(cli *Cli, ctx context.Context) error {
ExtraFlags: r.ExtraFlags,
MountVolumes: r.MountVolumes,
}
if builder.ExtraFlags != nil && slices.Contains(builder.ExtraFlags, "--secret") && len(config.Secrets) == 0 {
fmt.Fprintln(utils.Out, "Warning: you must declare your secrets in the configuration file as a list of strings.")
}
if err := builder.Run(ctx); err != nil {
if configErr := config.ValidateConfig(err); configErr != nil {
return configErr
Expand Down
7 changes: 7 additions & 0 deletions v2/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type Config struct {
Env map[string]string `yaml:"env,omitempty"`
Labels map[string]string `yaml:"labels,omitempty"`
Volumes []VolumeObject `yaml:"volumes,omitempty"`
Secrets []string `yaml:"secrets,omitempty"`
Links []struct {
Link struct {
Name string `yaml:"name"`
Expand Down Expand Up @@ -185,6 +186,12 @@ func (config *Config) Dockerfile(pupsArgs string, bakeEnv bool, mountVolumes boo
builder.WriteString("--mount=type=bind,from=volume_" + strconv.Itoa(i) + ",source=/,target=" + v.Volume.Guest + ",rw=true ")
}
}

// add secret mounts if any secrets exist
for _, secret := range config.Secrets {
builder.WriteString("--mount=type=secret,id=" + secret + " ")
}

builder.WriteString(
"cat /temp-config.yaml | /usr/local/bin/pups " + pupsArgs + " --stdin " +
"&& rm /temp-config.yaml\n")
Expand Down