rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-07-11 14:24:07 +00:00
Code Issues Releases Wiki Activity

Updated dapper files

Browse Source 
Migrated to SUSE containers, a newer version of Go, and using golangci-lint for all linting.
This commit is contained in:
Steffan Tucker 2022-07-07 18:54:04 -06:00
parent e21cabdc65
commit e8b47ab4c4
No known key found for this signature in database
GPG Key ID: 60F043A10B1E11F6
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile.dapper
View File

@ -1,20 +1,13 @@
FROM golang:1.13.4-alpine3.10 FROM registry.suse.com/bci/golang:1.17
ARG DAPPER_HOST_ARCH ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH
ARG CACHEBUST=1
RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates RUN zypper -n up && \
RUN go get -d golang.org/x/lint/golint && \ zypper -n in git docker vim curl wget
git -C /go/src/golang.org/x/lint/golint checkout -b current 06c8688daad7faa9da5a0c2f163a3d14aac986ca && \
go install golang.org/x/lint/golint && \
rm -rf /go/src /go/pkg
RUN mkdir -p /go/src/golang.org/x && \
cd /go/src/golang.org/x && git clone https://github.com/golang/tools && \
git -C /go/src/golang.org/x/tools checkout -b current aa82965741a9fecd12b026fbb3d3c6ed3231b8f8 && \
go install golang.org/x/tools/cmd/goimports
RUN rm -rf /go/src /go/pkg RUN rm -rf /go/src /go/pkg
RUN if [ "${ARCH}" == "amd64" ]; then \ RUN if [ "${ARCH}" == "amd64" ]; then \
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.46.2; \
fi fi
ENV GO111MODULE off ENV GO111MODULE off

18
scripts/validate
View File

@ -5,16 +5,10 @@ cd $(dirname $0)/..
echo Running validation echo Running validation
PACKAGES="$(find -name '*.go' | xargs -I{} dirname {} | cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')" if ! command -v golangci-lint; then
echo Skipping validation: no golangci-lint available
exit
fi
echo Running: go vet echo Running: golangci-lint
go vet ${PACKAGES} golangci-lint run
echo Running: golint
for i in ${PACKAGES}; do
if [ -n "$(golint $i | grep -v 'should have comment.*or be unexported' | tee /dev/stderr)" ]; then
failed=true
fi
done
test -z "$failed"
echo Running: go fmt
test -z "$(go fmt ${PACKAGES} | tee /dev/stderr)"