From 895ecb1251656ec5c5f566fff8079dc54e4b4484 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Tue, 1 Jan 2019 23:05:26 +0100
Subject: [PATCH 1/5] run build with non-root user

---
 wizard.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wizard.sh b/wizard.sh
index 52411120..91d206f6 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -84,8 +84,10 @@ buildAssets () {
     rm -rf dist/*
   fi;
 
+  set +e
   yarn install
   yarn build
+  set -e
 
   cd $REPO/http
   rice embed-go
@@ -187,11 +189,13 @@ build () {
     fi
 
     $(command -v winpty) docker run --rm -it \
+      -u "$(id -u)" \
       -v /$(pwd):/src:z \
       -w //src \
       -e COMMIT_SHA=$COMMIT_SHA \
+      -e XDG_CACHE_HOME="//tmp/.cache" \
       filebrowser/dev \
-      sh -c "dos2unix wizard.sh && ./wizard.sh -b"
+      sh -c "./wizard.sh -b"
 
   else
     buildAssets

From bc5b039a40454132daae399efb491a4eca4fa7c8 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 2 Jan 2019 00:58:22 +0100
Subject: [PATCH 2/5] replace gometalinter with golangci-lint

---
 .golangci.yml      | 20 ++++++++++++++++++++
 .gometalinter.json | 38 --------------------------------------
 frontend           |  2 +-
 wizard.sh          | 11 ++++-------
 4 files changed, 25 insertions(+), 46 deletions(-)
 create mode 100644 .golangci.yml
 delete mode 100644 .gometalinter.json

diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 00000000..20ad14f9
--- /dev/null
+++ b/.golangci.yml
@@ -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
diff --git a/.gometalinter.json b/.gometalinter.json
deleted file mode 100644
index ac903f42..00000000
--- a/.gometalinter.json
+++ /dev/null
@@ -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"
-  ]
-}
diff --git a/frontend b/frontend
index a9852a50..26423339 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit a9852a50b409c7c2d57663e6cf53e0980eee87b3
+Subproject commit 2642333928b21dd76c5bfb2457a19502d73d6475
diff --git a/wizard.sh b/wizard.sh
index 91d206f6..c0db35c8 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -112,16 +112,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
 }
 

From 6c17d93aee9fbd25e8afcf9233370c7a3e5e06be Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 2 Jan 2019 02:29:42 +0100
Subject: [PATCH 3/5] set GOPATH inside container to /tmp/gopath

---
 wizard.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wizard.sh b/wizard.sh
index c0db35c8..f7540ad9 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -190,6 +190,7 @@ build () {
       -v /$(pwd):/src:z \
       -w //src \
       -e COMMIT_SHA=$COMMIT_SHA \
+      -e GOPATH=//tmp/gopath \
       -e XDG_CACHE_HOME="//tmp/.cache" \
       filebrowser/dev \
       sh -c "./wizard.sh -b"

From eb9cef7917140466506ae19d0fa635d511f6e07c Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 2 Jan 2019 02:40:42 +0100
Subject: [PATCH 4/5] set HOME inside container to /tmp

---
 wizard.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wizard.sh b/wizard.sh
index f7540ad9..e9dafb34 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -84,10 +84,8 @@ buildAssets () {
     rm -rf dist/*
   fi;
 
-  set +e
   yarn install
   yarn build
-  set -e
 
   cd $REPO/http
   rice embed-go
@@ -190,8 +188,8 @@ build () {
       -v /$(pwd):/src:z \
       -w //src \
       -e COMMIT_SHA=$COMMIT_SHA \
+      -e HOME="//tmp" \
       -e GOPATH=//tmp/gopath \
-      -e XDG_CACHE_HOME="//tmp/.cache" \
       filebrowser/dev \
       sh -c "./wizard.sh -b"
 

From 668ce376616b5d205e593628af689a1036be19f0 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 2 Jan 2019 03:45:19 +0100
Subject: [PATCH 5/5] fix permission issue with rice-box

---
 wizard.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wizard.sh b/wizard.sh
index e9dafb34..ac245b2a 100755
--- a/wizard.sh
+++ b/wizard.sh
@@ -87,6 +87,7 @@ buildAssets () {
   yarn install
   yarn build
 
+  echo "Run rice"
   cd $REPO/http
   rice embed-go
 }
@@ -177,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