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) #1202

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
6 changes: 4 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.suse.com/bci/golang:1.22
FROM registry.suse.com/bci/golang:1.23

ARG DAPPER_HOST_ARCH
ARG http_proxy
Expand All @@ -15,6 +15,8 @@ ENV DAPPER_OUTPUT bin coverage.out
ENV DAPPER_RUN_ARGS --privileged --tmpfs /go/src/github.com/longhorn/longhorn-engine/integration/.venv:exec --tmpfs /go/src/github.com/longhorn/longhorn-engine/integration/.tox:exec -v /dev:/host/dev -v /proc:/host/proc --mount type=bind,source=/tmp,destination=/host/tmp,bind-propagation=rslave
ENV DAPPER_SOURCE /go/src/github.com/longhorn/longhorn-engine

ENV GOLANGCI_LINT_VERSION="v1.60.3"

WORKDIR ${DAPPER_SOURCE}
ENTRYPOINT ["./scripts/entry"]
CMD ["ci"]
Expand All @@ -36,7 +38,7 @@ RUN zypper -n install cmake curl git less file gcc python311 python311-pip pytho
rm -rf /var/cache/zypp/*

# Install golangci-lint
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}

# Install Minio
ENV MINIO_URL_amd64=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2021-12-20T22-07-16Z \
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func ResponseLogAndError(v interface{}) {
e, isErr := v.(error)
_, isRuntimeErr := e.(runtime.Error)
if isErr && !isRuntimeErr {
logrus.Errorf(fmt.Sprint(e))
logrus.Errorf("%v", e)
fmt.Println(fmt.Sprint(e))
} else {
logrus.Errorf("Caught FATAL error: %s", v)
Expand Down
2 changes: 1 addition & 1 deletion pkg/replica/diff_disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func (d *diffDisk) lookup(sector int64) (byte, error) {
for i := len(d.files) - 1; i > 1; i-- {
e, errno := fibmap.Fiemap(d.files[i].Fd(), uint64(sector*d.sectorSize), uint64(d.sectorSize), 1)
if errno != 0 {
return 0, fmt.Errorf(errno.Error())
return 0, fmt.Errorf("%v", errno)
}
if len(e) > 0 {
d.location[sector] = byte(i)
Expand Down
2 changes: 1 addition & 1 deletion pkg/replica/rpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (rs *ReplicaServer) ReplicaExpand(ctx context.Context, req *enginerpc.Repli
errWithCode = types.NewError(types.ErrorCodeFunctionFailedWithoutRollback,
err.Error(), "")
}
return nil, status.Errorf(codes.Internal, errWithCode.ToJSONString())
return nil, status.Errorf(codes.Internal, "%s", errWithCode.ToJSONString())
}

return &enginerpc.ReplicaExpandResponse{Replica: rs.getReplica()}, nil
Expand Down