Skip to content

fix: set container name when calling DockerRunOnceWithStream #832

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

Merged
merged 1 commit into from
Feb 1, 2023
Merged

fix: set container name when calling DockerRunOnceWithStream #832

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
2 changes: 2 additions & 0 deletions internal/db/diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func DiffSchema(ctx context.Context, source, target string, schema []string, p u
nil,
args,
nil,
"",
stream.Stdout(),
stream.Stderr(),
); err != nil {
Expand All @@ -97,6 +98,7 @@ func DiffSchema(ctx context.Context, source, target string, schema []string, p u
nil,
append([]string{"--schema", s}, args...),
nil,
"",
stream.Stdout(),
stream.Stderr(),
); err != nil {
Expand Down
1 change: 1 addition & 0 deletions internal/functions/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ func runServeAll(ctx context.Context, envFilePath string, noVerifyJWT *bool, imp
append(env, userEnv...),
[]string{"start", "--dir", relayFuncDir, "-p", "8081"},
binds,
utils.DenoRelayId,
os.Stdout,
os.Stderr,
); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions internal/utils/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,11 @@ func DockerRunOnce(ctx context.Context, image string, env []string, cmd []string
stderr = os.Stderr
}
var out bytes.Buffer
err := DockerRunOnceWithStream(ctx, image, env, cmd, nil, &out, stderr)
err := DockerRunOnceWithStream(ctx, image, env, cmd, nil, "", &out, stderr)
return out.String(), err
}

func DockerRunOnceWithStream(ctx context.Context, image string, env, cmd, binds []string, stdout, stderr io.Writer) error {
func DockerRunOnceWithStream(ctx context.Context, image string, env, cmd, binds []string, containerName string, stdout, stderr io.Writer) error {
// Cannot rely on docker's auto remove because
// 1. We must inspect exit code after container stops
// 2. Context cancellation may happen after start
Expand All @@ -318,7 +318,7 @@ func DockerRunOnceWithStream(ctx context.Context, image string, env, cmd, binds
Binds: binds,
// Allows containerized functions on Linux to reach host OS
ExtraHosts: []string{"host.docker.internal:host-gateway"},
}, "")
}, containerName)
if err != nil {
return err
}
Expand Down