diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ee01149a..0b053ffd 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -85,6 +85,8 @@ jobs: node-version: "22.x" cache: "pnpm" cache-dependency-path: "frontend/pnpm-lock.yaml" + - name: Install upx + run: sudo apt-get install -y upx - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx diff --git a/.goreleaser.yml b/.goreleaser.yml index 57b7b44a..e59ef7f9 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -40,6 +40,17 @@ archives: - goos: windows formats: ["zip"] +upx: + - enabled: true + goos: + - linux + - darwin + goarch: + - amd64 + - arm64 + compress: "best" + lzma: true + dockers: # Alpine docker images - dockerfile: Dockerfile diff --git a/CHANGELOG.md b/CHANGELOG.md index 139a0872..577ab35b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.38.0](https://github.com/filebrowser/filebrowser/compare/v2.37.0...v2.38.0) (2025-07-12) + + +### Features + +* Show the current users name in the sidebar ([#2821](https://github.com/filebrowser/filebrowser/issues/2821)) ([528ce92](https://github.com/filebrowser/filebrowser/commit/528ce92fad6dcc8e8b7910036bf9175146e27bf7)) +* Updates for project File Browser ([b4eddf4](https://github.com/filebrowser/filebrowser/commit/b4eddf45e4d7e6f6ccf242e67fe20f89f5e2f9a9)) + + +### Bug Fixes + +* prevent page change if there are outstanding edits ([#5260](https://github.com/filebrowser/filebrowser/issues/5260)) ([fbe169b](https://github.com/filebrowser/filebrowser/commit/fbe169b84f28cba22ea87f01b52f2420f1ea6814)) + ## [2.37.0](https://github.com/filebrowser/filebrowser/compare/v2.36.3...v2.37.0) (2025-07-08) diff --git a/Dockerfile b/Dockerfile index 0e64f120..68dec799 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.22 RUN apk update && \ - apk --no-cache add ca-certificates mailcap curl jq tini + apk --no-cache add ca-certificates mailcap jq tini # Make user and create necessary directories ENV UID=1000 @@ -29,4 +29,4 @@ VOLUME /srv /config /database EXPOSE 80 -ENTRYPOINT [ "tini", "--", "/init.sh", "filebrowser", "--config", "/config/settings.json" ] +ENTRYPOINT [ "tini", "--", "/init.sh" ] diff --git a/Dockerfile.s6 b/Dockerfile.s6 index cb34cbd1..7e281ad7 100644 --- a/Dockerfile.s6 +++ b/Dockerfile.s6 @@ -1,7 +1,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.22 RUN apk update && \ - apk --no-cache add ca-certificates mailcap curl jq + apk --no-cache add ca-certificates mailcap jq # Make user and create necessary directories RUN mkdir -p /config /database /srv && \ diff --git a/docker/alpine/init.sh b/docker/alpine/init.sh index 4dc5908a..ccd04cd4 100755 --- a/docker/alpine/init.sh +++ b/docker/alpine/init.sh @@ -7,4 +7,19 @@ if [ ! -f "/config/settings.json" ]; then cp -a /defaults/settings.json /config/settings.json fi -exec "$@" +# Deal with the case where user does not provide a config argument +has_config_arg=0 +for arg in "$@"; do + case "$arg" in + --config|--config=*|-c|-c=*) + has_config_arg=1 + break + ;; + esac +done + +if [ "$has_config_arg" -eq 0 ]; then + set -- --config=/config/settings.json "$@" +fi + +exec filebrowser "$@" \ No newline at end of file diff --git a/docker/common/healthcheck.sh b/docker/common/healthcheck.sh index e0ab1e65..3984adb6 100755 --- a/docker/common/healthcheck.sh +++ b/docker/common/healthcheck.sh @@ -6,4 +6,4 @@ PORT=${FB_PORT:-$(jq -r .port /config/settings.json)} ADDRESS=${FB_ADDRESS:-$(jq -r .address /config/settings.json)} ADDRESS=${ADDRESS:-localhost} -curl -f http://$ADDRESS:$PORT/health || exit 1 +wget -q --spider http://$ADDRESS:$PORT/health || exit 1 diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index 8991b571..93cda311 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -2,6 +2,10 @@