Skip to content

Sysreport : git #128

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
cgalibern merged 2 commits into from
Mar 12, 2026
Merged

Sysreport : git #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
783ee0d
Add git package to Alpine image in Dockerfile
sghf Mar 12, 2026
edc99cb
Return error on git commit failure
sghf Mar 12, 2026
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: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:latest AS builder

ARG BRANCH=${BRANCH:-main}

Check warning on line 3 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$BRANCH'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
ARG OSVC_GITREPO_URL=${OSVC_GITREPO_URL:-https://github.com/opensvc/oc3.git}

Check warning on line 4 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$OSVC_GITREPO_URL'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/

WORKDIR /opt
Expand All @@ -19,14 +19,14 @@

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

ENTRYPOINT ["/usr/bin/oc3"]
CMD ["worker"]

LABEL \

Check warning on line 29 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

Variables should be defined before their use 

UndefinedVar: Usage of undefined variable '$BUILDTIME'
More info: https://docs.docker.com/go/dockerfile/rule/undefined-var/
org.opencontainers.image.authors="OpenSVC SAS" \
org.opencontainers.image.created="${BUILDTIME}" \
org.opencontainers.image.licenses="Apache-2.0" \
Expand Down
2 changes: 1 addition & 1 deletion scheduler/task_sysreport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading