From 783ee0dc02e4f567c6307d67a1d0ed466b80babb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Guih=C3=A9neuf?= Date: Thu, 12 Mar 2026 11:58:15 +0100 Subject: [PATCH 1/2] Add git package to Alpine image in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f5c543..baf7bd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN echo "Cache busted at $(date): oc3 version: $(./dist/oc3 version)" FROM alpine:3.20.1 -RUN apk add --no-cache bash +RUN apk add --no-cache bash git COPY --from=builder /opt/oc3/dist/oc3 /usr/bin/oc3 From edc99cb450fe4771b52623d4b6ad3b8632b89537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Guih=C3=A9neuf?= Date: Thu, 12 Mar 2026 12:07:31 +0100 Subject: [PATCH 2/2] Return error on git commit failure --- scheduler/task_sysreport.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/task_sysreport.go b/scheduler/task_sysreport.go index 41892f8..0cf1389 100644 --- a/scheduler/task_sysreport.go +++ b/scheduler/task_sysreport.go @@ -65,7 +65,7 @@ func taskSysreport(ctx context.Context, task *Task) error { sysreportDir := viper.GetString("scheduler.directories.uploads") nodeDir := filepath.Join(sysreportDir, "sysreport", data.NodeID) if err := git.Commit(nodeDir); err != nil { - task.Errorf("git commit: %s", err) + return fmt.Errorf("git commit: %w", err) } if err := odb.Commit(); err != nil {