From aef8f745eb7989575d7158bff4a2ffffc366d317 Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Thu, 5 Sep 2024 13:36:06 +0200 Subject: [PATCH] Add more info to errors --- Dockerfile | 40 ++++++++++++++++++++-------------------- main.go | 16 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d93429..413272a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ -FROM golang:1.22.2 as base - -WORKDIR $GOPATH/src/app/ - -COPY . . - -RUN go mod download -RUN go mod verify - -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /main . - -FROM scratch - -COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo -COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=base /etc/passwd /etc/passwd -COPY --from=base /etc/group /etc/group - -COPY --from=base /main . - +FROM golang:1.22.2 as base + +WORKDIR $GOPATH/src/app/ + +COPY . . + +RUN go mod download +RUN go mod verify + +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /main . + +FROM scratch + +COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo +COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=base /etc/passwd /etc/passwd +COPY --from=base /etc/group /etc/group + +COPY --from=base /main . + CMD ["/main"] \ No newline at end of file diff --git a/main.go b/main.go index aeb66dc..428bd9e 100644 --- a/main.go +++ b/main.go @@ -93,33 +93,33 @@ func main() { func doRun() { status, err := doStatus() if err != nil { - log.Println("Error executing doStatus:", err) + log.Printf("Error executing doStatus code %v with out: %v", err, status) return } if status == "" { log.Printf("Nothing to commit") return } - log.Println("Changes detected") + log.Printf("Changes detected") res, err := doAddAll() if err != nil { - log.Println("Error executing doAddAll:", err) + log.Printf("Error executing doAddAll with code %v and out: %v", err, res) return } - log.Println("Changes added to index:", res) + log.Printf("Changes added to index: %v", res) - _, err = setIdentity() + res, err = setIdentity() if err != nil { - log.Println("Error setting identity:", err) + log.Printf("Error setting identity with code %v and out: %v", err, res) } res, err = doCommit() if err != nil { - log.Println("Error executing doCommitAll:", err) + log.Printf("Error executing doCommitAll with code %v and out: %v", err, res) return } - log.Println("Changes committed:", res) + log.Printf("Changes committed: %v", res) } func doStatus() (string, error) {