Merge pull request #595 from filebrowser/non-root

[v2] Replace gometalinter with golangci-lint, run non-root
This commit is contained in:
Henrique Dias 2019-01-02 08:57:33 +00:00 committed by GitHub
commit a0cb4e3c19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 47 deletions

20
.golangci.yml Normal file
View File

@ -0,0 +1,20 @@
run:
deadline: 5m
linters:
enable:
- deadcode
- govet
- ineffassign
- interfacer
- maligned
- megacheck
- structcheck
- unconvert
- varcheck
enable-all: false
disable-all: true
# presets:
# - bugs
# - unused
fast: false

View File

@ -1,38 +0,0 @@
{
"Enable": [
"deadcode",
"gotype",
"gotypex",
"ineffassign",
"interfacer",
"maligned",
"megacheck",
"structcheck",
"unconvert",
"varcheck",
"vet"
],
"Disable": [
"dupl",
"errcheck",
"gochecknoglobals",
"gochecknoinits",
"goconst",
"gocyclo",
"gofmt",
"goimports",
"golint",
"gosec",
"gosimple",
"lll",
"misspell",
"nakedret",
"safesql",
"staticcheck",
"test",
"testify",
"unparam",
"unused",
"vetshadow"
]
}

@ -1 +1 @@
Subproject commit a9852a50b409c7c2d57663e6cf53e0980eee87b3
Subproject commit 2642333928b21dd76c5bfb2457a19502d73d6475

View File

@ -87,6 +87,7 @@ buildAssets () {
yarn install
yarn build
echo "Run rice"
cd $REPO/http
rice embed-go
}
@ -110,16 +111,13 @@ buildBinary () {
lint () {
cd $REPO
dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s ./...'
WDIR="/go/src/github.com/filebrowser/filebrowser"
if [ "$USE_DOCKER" != "" ]; then
$(command -v winpty) docker run --rm -itv "/$(pwd):/$WDIR" -w "/$WDIR" filebrowser/dev sh -c "\
GO111MODULE=on go get -v ./... && \
GO111MODULE=on go mod vendor && \
GO111MODULE=off $dolint"
$(command -v winpty) docker run --rm -itv "/$(pwd)://src" -w "//src" filebrowser/dev sh -c "\
go get -v ./... && \
golangci-lint run -v"
else
$dolint
golangci-lint run -v
fi
}
@ -180,6 +178,10 @@ build () {
rm -rf frontend/dist
fi;
if [ -f "http/rice-box.go" ]; then
rm -f http/rice-box.go
fi;
if [ "$(command -v git)" != "" ]; then
COMMIT_SHA="$(git rev-parse HEAD | cut -c1-8)"
else
@ -187,11 +189,14 @@ build () {
fi
$(command -v winpty) docker run --rm -it \
-u "$(id -u)" \
-v /$(pwd):/src:z \
-w //src \
-e COMMIT_SHA=$COMMIT_SHA \
-e HOME="//tmp" \
-e GOPATH=//tmp/gopath \
filebrowser/dev \
sh -c "dos2unix wizard.sh && ./wizard.sh -b"
sh -c "./wizard.sh -b"
else
buildAssets