Skip to content
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.

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

chore(deps): update registry.suse.com/bci/golang docker tag to v1.23 (master) #187

Merged
merged 3 commits into from
Sep 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM registry.suse.com/bci/golang:1.22
FROM registry.suse.com/bci/golang:1.23

ARG DAPPER_HOST_ARCH=amd64
ARG http_proxy
ARG https_proxy
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
ENV GOLANGCI_LINT_VERSION="v1.60.3"

RUN zypper -n install gcc ca-certificates git wget curl vim less file nfs-client awk docker && \
rm -rf /var/cache/zypp/*

ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}

ENV DAPPER_SOURCE /go/src/github.com/longhorn/backupstore
ENV DAPPER_OUTPUT ./bin coverage.out
Expand Down
2 changes: 1 addition & 1 deletion cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
e, isErr := v.(error)
_, isRuntimeErr := e.(runtime.Error)
if isErr && !isRuntimeErr {
logrus.Errorf(fmt.Sprint(e))
logrus.Errorf("%v", e)

Check warning on line 83 in cmd/list.go

View check run for this annotation

Codecov / codecov/patch

cmd/list.go#L83

Added line #L83 was not covered by tests
fmt.Println(fmt.Sprint(e))
} else {
logrus.Errorf("Caught FATAL error: %s", v)
Expand Down
2 changes: 1 addition & 1 deletion s3/s3_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
if reqErr, ok := err.(awserr.RequestFailure); ok {
message += fmt.Sprintln(reqErr.StatusCode(), reqErr.RequestID())
}
return fmt.Errorf(message)
return fmt.Errorf("%s", message)

Check warning on line 94 in s3/s3_service.go

View check run for this annotation

Codecov / codecov/patch

s3/s3_service.go#L94

Added line #L94 was not covered by tests
}
return err
}
Expand Down