Skip to content

refactor(server): expand artifact build log with stderr #303

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
alexey-igrychev merged 5 commits into from
Feb 27, 2025
Merged

refactor(server): expand artifact build log with stderr #303

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a13e44e
chore(server): expand artifact build log with stderr
Fral738 Feb 26, 2025
d73ae4a
chore(trdl, server): remove unnecessary goroutine for io.Copy in stde…
Fral738 Feb 27, 2025
716cfcd
chore(trdl,server): refactor error handling in cmd.Wait with improved…
Fral738 Feb 27, 2025
2a99e71
chore(trdl, server): fix syntax
Fral738 Feb 27, 2025
7a320bc
chore(trdl,server): add error message extraction by prefix
Fral738 Feb 27, 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
27 changes: 25 additions & 2 deletions server/pkg/docker/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ package docker

import (
"archive/tar"
"bytes"
"context"
"fmt"
"io"
"log"
"os/exec"
"path"

Expand Down Expand Up @@ -105,11 +108,31 @@ func BuildReleaseArtifacts(ctx context.Context, opts BuildReleaseArtifactsOpts,
func RunCliBuild(contextReader *nio.PipeReader, tarWriter *nio.PipeWriter, args ...string) error {
finalArgs := append([]string{"buildx", "build"}, args...)
cmd := exec.Command("docker", finalArgs...)

cmd.Stdout = tarWriter
cmd.Stdin = contextReader

if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to execute docker build: %w", err)
stderrPipe, err := cmd.StderrPipe()
if err != nil {
return fmt.Errorf("failed to create stderr pipe: %w", err)
}

if err := cmd.Start(); err != nil {
return fmt.Errorf("error starting docker build: %w", err)
}

var stderr bytes.Buffer
go func() {
if _, err := io.Copy(&stderr, stderrPipe); err != nil {
log.Printf("error writing stderr buffer: %s", err.Error())
}
}()

if err := cmd.Wait(); err != nil {
if stderr.Len() > 0 {
log.Println("Docker build error output:", stderr.String())
}
return fmt.Errorf("failed to execute docker build: %w: %s", err, stderr.String())
}

return nil
Expand Down