User folder

.github/workflows/balena-pr-draft.yml

@@ -27,4 +27,4 @@ jobs:
           github_head_ref: ${{ github.head_ref }}
           balena_release_type: draft
           release_tag: ${{ github.ref_name }}
-          commit: ${{ github.sha }}
+          commit: $(git rev-parse HEAD)

.github/workflows/balena-push-main.yml

@@ -27,4 +27,4 @@ jobs:
           github_head_ref: ${{ github.head_ref }}
           balena_release_type: draft
           release_tag: main
-          commit: ${{ github.sha }}
+          commit: $(git rev-parse HEAD)

balena.yml

@@ -1,6 +1,6 @@
 name: "Earth Defender's Toolkit Offline"
 type: "sw.application"
-version: 0.5.0
+version: 0.5.3
 description: "A low-energy device that creates an access-point serving applications, bridging them and exposing curated content offline.
   Software stack and content are automatically updated while online, and can be updated offline."
 assets:

docker-compose.yml

@@ -1,16 +1,19 @@
 version: "2.1"
 
 volumes:
-  interface_db:
-  wifi_db:
-  syncthing:
   fdroid:
   mapeo:
   crawls:
-  pywb-archive:
+  mbtiles:
   installers:
+  pywb-archive:
+  users:
+  interface_db:
+  wifi_db:
+  syncthing:
   postgres_data:
-  mbtiles:
+  filebrowser-db:
+  filebrowser-json:
   terrastories-bundler:
   terrastories-media:
   terrastories-import:
@@ -78,8 +81,11 @@ services:
       - fdroid:/srv/fdroid
       - installers:/srv/installers
       - mbtiles:/srv/mbtiles
+      - users:/srv/users
       - terrastories-import:/srv/terrastories/import
       - terrastories-media:/srv/terrastories/media
+      - filebrowser-db:/database.db
+      - filebrowser-json:/.filebrowser.json
     ports:
       - 8081:80
     command: -- c
@@ -93,6 +99,7 @@ services:
       - fdroid:/data/fdroid
       - installers:/data/installers
       - mbtiles:/data/mbtiles
+      - users:/data/users
     ports:
       - 8082:8384
       - 22000:22000/tcp
@@ -154,6 +161,7 @@ services:
       - fdroid:/usr/local/apache2/htdocs/repo
       - mapeo:/usr/local/apache2/htdocs/mapeo
       - mbtiles:/usr/local/apache2/htdocs/mbtiles
+      - users:/usr/local/apache2/htdocs/users
     restart: unless-stopped
   # https://hub.docker.com/r/communityfirst/pataka-cli
   pataka:

services/filebrowser/Dockerfile

@@ -1,4 +1,4 @@
-FROM filebrowser/filebrowser:s6
+FROM filebrowser/filebrowser:v2.23.0-s6
 
 COPY custom /config/custom
 COPY start.sh .

services/filebrowser/start.sh

@@ -4,11 +4,16 @@ echo "--------- Starting FileBrowser -----------"
 echo "Initiating config"
 filebrowser config init
 echo "Creating new user"
+mkdir -p /users
+chown -R 1000:1000 /users
 filebrowser users add ${ADMIN_LOGIN} ${ADMIN_PASSWORD} --perm.admin --lockPassword
 echo "Loading config file"
 echo "LOCALE: $LOCALE"
 echo "Using user: $ADMIN_LOGIN and password: $ADMIN_PASSWORD"
 sed -i -r "s/#LOCALE/$LOCALE/g" /config/custom/filebrowser.json
 filebrowser config import /config/custom/filebrowser.json
 filebrowser config set --branding.files "/config/custom/branding"
-filebrowser
+if [ -n "$FILE_NOAUTH" ]; then
+  filebrowser config set --auth.method noauth
+fi
+filebrowser