.goreleaser.yml

@@ -131,7 +131,7 @@ dockers:
       - "filebrowser/filebrowser:v{{ .Major }}-amd64-s6"
     extra_files:
       - docker
-  - dockerfile: Dockerfile.s6
+  - dockerfile: Dockerfile.s6.aarch64
     use: buildx
     build_flag_templates:
       - "--pull"

CHANGELOG.md

@@ -2,13 +2,6 @@
 
 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.36.1](https://github.com/filebrowser/filebrowser/compare/v2.36.0...v2.36.1) (2025-07-03)
-
-
-### Bug Fixes
-
-* remove associated shares when deleting file/folder ([e99e0b3](https://github.com/filebrowser/filebrowser/commit/e99e0b3028e1c8a50e1744bb07ecc8e809bdb8e6))
-
 ## [2.36.0](https://github.com/filebrowser/filebrowser/compare/v2.35.0...v2.36.0) (2025-07-02)
 
 

Dockerfile.s6.aarch64

@@ -0,0 +1,23 @@
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22
+
+RUN apk update && \
+  apk --no-cache add ca-certificates mailcap curl jq
+
+# Make user and create necessary directories
+RUN mkdir -p /config /database /srv && \
+  chown -R abc:abc /config /database /srv
+
+# Copy files and set permissions
+COPY filebrowser /bin/filebrowser
+COPY docker/common/ /
+COPY docker/s6/ /
+
+RUN chown -R abc:abc /bin/filebrowser /defaults healthcheck.sh
+
+# Define healthcheck script
+HEALTHCHECK --start-period=2s --interval=5s --timeout=3s CMD /healthcheck.sh
+
+# Set the volumes and exposed ports
+VOLUME /srv /config /database
+
+EXPOSE 80

www/docs/installation.md

@@ -32,43 +32,37 @@ File Browser is now up and running. Read some [first boot](#first-boot) for more
 
 ## Docker
 
-File Browser is available as two different Docker images, which can be found on [Docker Hub](https://hub.docker.com/r/filebrowser/filebrowser): a [bare Alpine image](#bare-alpine-image) and an [S6 Overlay image](#s6-overlay-image).
+File Browser is available as two different Docker images, which can be found on [Docker Hub](https://hub.docker.com/r/filebrowser/filebrowser).
 
-### Bare Alpine Image
+=== "Alpine"
 
-```sh
-docker run \
-    -v filebrowser_data:/srv \
-    -v filebrowser_database:/database \
-    -v filebrowser_config:/config \
-    -p 8080:80 \
-    filebrowser/filebrowser
-```
+    The 
 
-Where `filebrowser_data`, `filebrowser_database` and `filebrowser_config` are Docker [volumes](https://docs.docker.com/engine/storage/volumes/), where the data, database and configuration will be stored, respectively. The default configuration and database will be automatically initialized.
+    ```sh
+    docker run \
+      -v /path/to/srv:/srv \
+      -v /path/to/database:/database \
+      -v /path/to/config:/config \
+      -p 8080:80 \
+      filebrowser/filebrowser
+    ```
 
-The default user that runs File Browser inside the container has PID 1000 and GID 1000. If, for one reason or another, you want to run the Docker container with a different user, please consult Docker's [user documentation](https://docs.docker.com/engine/containers/run/#user).
+    The default user has PID 1000 and GID 1000. Please make sure that this user has access to the different mounted volumes. To change the user running inside the Docker image, you need to use the [`--user` flag](https://docs.docker.com/engine/containers/run/#user).
 
-> [!NOTE]
->
-> When using [bind mounts](https://docs.docker.com/engine/storage/bind-mounts/), that is, when you mount a path on the host in the container, you must manually ensure that they have the correct **permissions**. Docker does not do this automatically for you. The host directories must be readable and writable by the user running inside the container. You can use the [`chown`](https://linux.die.net/man/1/chown) command to change the owner of those paths.
+=== "s6 overlay"
 
-File Browser is now up and running. Read the ["First Boot"](#first-boot) section for more information.
+    The `s6` image is based on LinuxServer and leverages the [s6-overlay](https://github.com/just-containers/s6-overlay) system for a standard, highly customizable image. It should be used as follows:
 
-### S6 Overlay Image
-
-The `s6` image is based on LinuxServer and leverages the [s6-overlay](https://github.com/just-containers/s6-overlay) system for a standard, highly customizable image. It should be used as follows:
-
-```shell
-docker run \
-    -v /path/to/srv:/srv \
-    -v /path/to/database:/database \
-    -v /path/to/config:/config \
-    -e PUID=$(id -u) \
-    -e PGID=$(id -g) \
-    -p 8080:80 \
-    filebrowser/filebrowser:s6
-```
+    ```shell
+    docker run \
+      -v /path/to/srv:/srv \
+      -v /path/to/database:/database \
+      -v /path/to/config:/config \
+      -e PUID=$(id -u) \
+      -e PGID=$(id -g) \
+      -p 8080:80 \
+      filebrowser/filebrowser:s6
+    ```
 
 Where:
 
@@ -78,7 +72,24 @@ Where:
 
 Both `settings.json` and `filebrowser.db` will automatically be initialized if they don't exist.
 
-File Browser is now up and running. Read the ["First Boot"](#first-boot) section for more information.
+File Browser is now up and running. Read some [first boot](#first-boot) for more information.
+
+> [!NOTE]
+>
+> The Alpine Docker image has breaking changes from v2.33.0, in order to address multiple issues that have continuously affected multiple users. The changes are as follows:
+>
+> - **User**: File Browser no longer runs as `root`, but as user with PID 1000 and GID 1000. You can still change this by using Docker's [`--user` flag](https://www.docker.com/blog/understanding-the-docker-user-instruction/).
+> - **Volumes**: the volumes with the database and configuration are now aligned with the s6-overlay images. Instead of mounting the files themselves, which leads to frequent issues, you now mount the surrounding directory.
+>
+> Assuming you have a `database.db`, a `.filebrowser.json` and the data in `/data`, do the following:
+> 
+> 1. Change the path of `database` in `.filebrowser.json` to `/database/filebrowser.db`
+> 2. Rename `database.db` to `filebrowser.db`
+> 3. Rename `.filebrowser.json` to `settings.json`
+> 4. Put them in the same directory locally, let's say `/app/filebrowser/`
+> 5. Change the permissions of both directories: `sudo chown -R 1000:1000 /app/filebrowser /data`
+> 6. Mount with the flags `-v /app/filebrowser:/database -v /app/filebrowser:/config` - you can also choose to put them in separate directories, but it is not needed.
+
 
 ## First Boot