diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 0a9eaf5c..278ef0d2 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -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 @@ -12,6 +12,8 @@ ENV DAPPER_OUTPUT bin coverage.out ENV DAPPER_RUN_ARGS --privileged -v /dev:/host/dev -v /proc:/host/proc ENV DAPPER_SOURCE /go/src/github.com/longhorn/longhorn-share-manager +ENV GOLANGCI_LINT_VERSION="v1.60.3" + WORKDIR ${DAPPER_SOURCE} ENTRYPOINT ["./scripts/entry"] CMD ["ci"] @@ -24,7 +26,7 @@ RUN zypper -n install wget git jq tar gzip gcc linux-glibc-devel glibc-devel-sta 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/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 docker buildx: The docker version in dapper is too old to have buildx. Install it manually. RUN curl -sSfLO https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-${ARCH} && \ diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go index 2006520e..aa57c160 100644 --- a/pkg/rpc/server.go +++ b/pkg/rpc/server.go @@ -258,7 +258,7 @@ func (s *ShareManagerServer) Mount(ctx context.Context, req *emptypb.Empty) (res isMountPoint, err := mounter.IsMountPoint(mountPath) if err != nil { err = errors.Wrapf(err, "failed to check mount point %v", mountPath) - return &emptypb.Empty{}, grpcstatus.Errorf(grpccodes.Internal, err.Error()) + return &emptypb.Empty{}, grpcstatus.Errorf(grpccodes.Internal, "%v", err) } if !isMountPoint { log.Info("Mounting volume")