knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix premature Close() of docker client (#1056) 

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2022-06-14 00:46:15 +02:00 committed by GitHub
parent df7b5733f1
commit 5f6d11c491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
s2i/builder.go
View File

@ -115,7 +115,19 @@ func (b *Builder) Build(ctx context.Context, f fn.Function) (err error) {
// Create the S2I builder instance if not overridden
if b.impl == nil {
if b.impl, err = newImpl(ctx, cfg); err != nil {
var client dockerClient.CommonAPIClient
client, _, err = docker.NewClient(dockerClient.DefaultDockerHost)
if err != nil {
return
}
defer client.Close()
if isPodman(ctx, client) {
client = podmanDockerClient{client}
}
b.impl, _, err = strategies.Strategy(client, cfg, build.Overrides{})
if err != nil {
return
}
}
@ -157,18 +169,3 @@ func builderImage(f fn.Function) (string, error) {
return "", ErrRuntimeNotSupported
}
// new S2I implementation using a docker client wrapped as necessary in the
// case of podman.
func newImpl(ctx context.Context, cfg *api.Config) (impl build.Builder, err error) {
client, _, err := docker.NewClient(dockerClient.DefaultDockerHost)
if err != nil {
return
}
defer client.Close()
if isPodman(ctx, client) {
client = podmanDockerClient{client}
}
impl, _, err = strategies.Strategy(client, cfg, build.Overrides{})
return
}