Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: pass through signals to inner container #134

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 6 commits into from
Apr 1, 2025
Merged

feat: pass through signals to inner container #134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b34ee64
feat: pass through signals to inner container
sreya Jul 3, 2024
f0597fc
fix rebase
sreya Mar 31, 2025
ce73172
lint
sreya Mar 31, 2025
43b47f4
no sleep
sreya Mar 31, 2025
4a46f67
pr changes
sreya Apr 1, 2025
4788a6b
Merge branch 'main' into jon/shutdownscript
sreya Apr 1, 2025
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
Prev Previous commit
Next Next commit
lint
  • Loading branch information
@sreya
sreya committed Mar 31, 2025
commit ce73172e9ecb032aae5e88813e90a10f2aad63a5
3 changes: 2 additions & 1 deletion cli/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ func dockerCmd() *cobra.Command {

httpClient, err := xhttp.Client(log, flags.extraCertsPath)
if err != nil {
//nolint
return xerrors.Errorf("http client: %w", err)
}

Expand Down Expand Up @@ -395,7 +396,7 @@ func dockerCmd() *cobra.Command {
log.Debug(ctx, "killing container", slog.F("bootstrap_pid", bootstrapPID))

// The PID returned is the PID _outside_ the container...
out, err := exec.Command("kill", "-TERM", strconv.Itoa(bootstrapPID)).CombinedOutput()
out, err := exec.Command("kill", "-TERM", strconv.Itoa(bootstrapPID)).CombinedOutput() //nolint:gosec
if err != nil {
log.Error(ctx, "kill bootstrap process", slog.Error(err), slog.F("output", string(out)))
return
Expand Down
3 changes: 2 additions & 1 deletion dockerutil/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ func BootstrapContainer(ctx context.Context, client Client, conf BootstrapConfig

var err error
for r, n := retry.New(time.Second, time.Second*2), 0; r.Wait(ctx) && n < 10; n++ {
out, err := ExecContainer(ctx, client, ExecConfig{
var out []byte
out, err = ExecContainer(ctx, client, ExecConfig{
ContainerID: conf.ContainerID,
User: conf.User,
Cmd: "/bin/sh",
Expand Down
Loading