diff --git a/Dockerfile b/Dockerfile index e702ea6f..8714b83a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ EXPOSE 80 WORKDIR /app -COPY --from=base /app/docker_config.json /.filebrowser.json +COPY --from=base /app/docker_config.json ./.filebrowser.json COPY --from=base /app/filebrowser ./filebrowser COPY --from=nbuild /app/dist/ ./frontend/dist/ diff --git a/src/backend/cmd/upgrade.go b/src/backend/cmd/upgrade.go index 9f747c9c..be9769c2 100644 --- a/src/backend/cmd/upgrade.go +++ b/src/backend/cmd/upgrade.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/filebrowser/filebrowser/v2/storage/bolt/importer" + "github.com/gtsteffaniak/filebrowser/storage/bolt/importer" ) func init() { diff --git a/src/backend/docker_config.json b/src/backend/docker_config.json index f0fa64a6..b491ee6e 100644 --- a/src/backend/docker_config.json +++ b/src/backend/docker_config.json @@ -1,5 +1,5 @@ { - "port": 80, + "port": 8080, "baseURL": "", "address": "", "log": "stdout", diff --git a/src/backend/go.mod b/src/backend/go.mod index 8b2b5917..31dc790d 100644 --- a/src/backend/go.mod +++ b/src/backend/go.mod @@ -1,12 +1,11 @@ module github.com/gtsteffaniak/filebrowser -go 1.18 +go 1.20 require ( github.com/asdine/storm/v3 v3.2.1 github.com/disintegration/imaging v1.6.2 github.com/dsoprea/go-exif/v3 v3.0.0-20201216222538-db167117f483 - github.com/filebrowser/filebrowser/v2 v2.23.0 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/golang-jwt/jwt/v4 v4.4.3 github.com/gorilla/mux v1.8.0 diff --git a/src/backend/go.sum b/src/backend/go.sum index aeeaafba..3b5fde8a 100644 --- a/src/backend/go.sum +++ b/src/backend/go.sum @@ -79,8 +79,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/filebrowser/filebrowser/v2 v2.23.0 h1:t/crFqwgD7WBo/1xNCdWcD+Ba/m7qJHiareCxeiomF8= -github.com/filebrowser/filebrowser/v2 v2.23.0/go.mod h1:21YATGQ81ia3RgvnvkFGXx8E7JYgDqC1pfNI5AggfKQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=