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.

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

fix: do not trust builder when using podman #420

Merged
merged 1 commit into from
Jul 14, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 25 additions & 12 deletions buildpacks/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,6 @@ func (builder *Builder) Build(ctx context.Context, f fn.Function) (err error) {
network = "host"
}

packOpts := pack.BuildOptions{
AppPath: f.Root,
Image: f.Image,
Builder: packBuilder,
TrustBuilder: strings.HasPrefix(packBuilder, "quay.io/boson"),
DockerHost: os.Getenv("DOCKER_HOST"),
ContainerConfig: struct {
Network string
Volumes []string
}{Network: network, Volumes: nil},
}

// log output is either STDOUt or kept in a buffer to be printed on error.
var logWriter io.Writer
if builder.Verbose {
Expand All @@ -111,6 +99,31 @@ func (builder *Builder) Build(ctx context.Context, f fn.Function) (err error) {
return err
}

version, err := dockerClient.ServerVersion(ctx)
if err != nil {
return err
}

var deamonIsPodman bool
for _, component := range version.Components {
if component.Name == "Podman Engine" {
deamonIsPodman = true
break
}
}

packOpts := pack.BuildOptions{
AppPath: f.Root,
Image: f.Image,
Builder: packBuilder,
TrustBuilder: !deamonIsPodman && strings.HasPrefix(packBuilder, "quay.io/boson"),
DockerHost: os.Getenv("DOCKER_HOST"),
ContainerConfig: struct {
Network string
Volumes []string
}{Network: network, Volumes: nil},
}

dockerClientWrapper := &clientWrapper{dockerClient}
packClient, err := pack.NewClient(pack.WithLogger(logging.New(logWriter)), pack.WithDockerClient(dockerClientWrapper))
if err != nil {
Expand Down