particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild-worker-executor: adapt worker-executor to osbuild-composer

Browse source
This commit is contained in:
Sanne Raymaekers 2024-05-17 19:41:11 +02:00
parent 591ff8c46c
commit f18293c2f1
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmd/osbuild-worker-executor/handler_build.go
View file

@ -81,6 +81,7 @@ func runOsbuild(logger *logrus.Logger, buildDir string, control *controlJSON, ou
return "", err return "", err
} }
// the result is put into a tar because we get sparse file support for free this way
// #nosec G204 // #nosec G204
cmd = exec.Command( cmd = exec.Command(
"tar", "tar",

1
cmd/osbuild-worker-executor/handler_build_test.go
View file

@ -282,7 +282,6 @@ echo "fake-build-result" > %[1]s/build/output/image/disk.img
assert.Equal(t, http.StatusCreated, rsp.StatusCode) assert.Equal(t, http.StatusCreated, rsp.StatusCode)
reader := bufio.NewReader(rsp.Body) reader := bufio.NewReader(rsp.Body)
var lineno, seconds, nano int64 var lineno, seconds, nano int64
for i := 1; i <= 3; i++ { for i := 1; i <= 3; i++ {
line, err := reader.ReadString('\n') line, err := reader.ReadString('\n')

2
cmd/osbuild-worker-executor/main.go
View file

@ -74,7 +74,7 @@ func run(ctx context.Context, args []string, getenv func(string) string, logger
func main() { func main() {
logger := logrus.New() logger := logrus.New()
ctx := context.Background() ctx := context.Background()
if err := run(ctx, os.Args, os.Getenv, logger); err != nil { if err := run(ctx, os.Args[1:], os.Getenv, logger); err != nil {
fmt.Fprintf(os.Stderr, "%s\n", err) fmt.Fprintf(os.Stderr, "%s\n", err)
os.Exit(1) os.Exit(1)
} }