fix filebrowser

mafredri · mafredri · commit e51c6673b540 · 2025-06-27T17:40:27.000Z
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,15 +2,16 @@
 	"name": "Development environments on your infrastructure",
 	"image": "codercom/oss-dogfood:latest",
 	"features": {
-		// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
 			"moby": "false"
 		},
 		"ghcr.io/coder/devcontainer-features/code-server:1": {
 			"auth": "none",
 			"port": 13337
 		},
-		"./filebrowser": {}
+		"./filebrowser": {
+			"folder": "${containerWorkspaceFolder}"
+		}
 	},
 	// SYS_PTRACE to enable go debugging
 	"runArgs": ["--cap-add=SYS_PTRACE"],
diff --git a/.devcontainer/filebrowser/devcontainer-feature.json b/.devcontainer/filebrowser/devcontainer-feature.json
@@ -9,19 +9,15 @@
 			"default": "13339",
 			"description": "The port to run filebrowser on"
 		},
-		// "folder": {
-		// 	"type": "string",
-		// 	"default": "${containerWorkspaceFolder}",
-		// 	"description": "The root directory for filebrowser to serve"
-		// },
-		"auth": {
+		"folder": {
 			"type": "string",
-			"enum": [
-				"none",
-				"password"
-			],
-			"default": "none",
-			"description": "Authentication method (none or password)"
+			"default": "",
+			"description": "The root directory for filebrowser to serve"
+		},
+		"baseUrl": {
+			"type": "string",
+			"default": "",
+			"description": "The base URL for filebrowser (e.g., /filebrowser)"
 		}
 	},
 	"entrypoint": "/usr/local/bin/filebrowser-entrypoint",
diff --git a/.devcontainer/filebrowser/install.sh b/.devcontainer/filebrowser/install.sh
@@ -11,46 +11,36 @@ if ! command -v filebrowser &>/dev/null; then
 	curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
 fi
 
-printf "🥳 Installation complete!\n\n"
-
-# Create run script.
+# Create entrypoint.
 cat >/usr/local/bin/filebrowser-entrypoint <<EOF
-#!/bin/bash
-
-printf "🛠️ Configuring filebrowser\n\n"
+#!/usr/bin/env bash
 
-AUTH="${AUTH}"
 PORT="${PORT}"
-FOLDER="$(pwd)"
+FOLDER="${FOLDER:-}"
+FOLDER="\${FOLDER:-\$(pwd)}"
+BASEURL="${BASEURL:-}"
 LOG_PATH=/tmp/filebrowser.log
-export FB_DATABASE="/tmp/filebrowser.db"
+export FB_DATABASE="\${HOME}/.filebrowser.db"
+
+printf "🛠️ Configuring filebrowser\n\n"
 
 # Check if filebrowser db exists.
 if [[ ! -f "\${FB_DATABASE}" ]]; then
 	filebrowser config init
-	if [[ "\$AUTH" == "password" ]]; then
-		filebrowser users add admin admin --perm.admin=true --viewMode=mosaic
-	fi
-fi
-
-# Configure filebrowser.
-if [[ "\$AUTH" == "none" ]]; then
-	filebrowser config set --port="\${PORT}" --auth.method=noauth --root="\${FOLDER}"
-else
-	filebrowser config set --port="\${PORT}" --auth.method=json --root="\${FOLDER}"
+	filebrowser users add admin "" --perm.admin=true --viewMode=mosaic
 fi
 
-set -euo pipefail
+filebrowser config set --baseurl=\${BASEURL} --port=\${PORT} --auth.method=noauth --root=\${FOLDER}
 
 printf "👷 Starting filebrowser...\n\n"
+
 printf "📂 Serving \${FOLDER} at http://localhost:\${PORT}\n\n"
 
-filebrowser >>\${LOG_PATH} 2>&1 &
+filebrowser >>\${LOG_PATH} &
 
 printf "📝 Logs at \${LOG_PATH}\n\n"
 EOF
 
 chmod +x /usr/local/bin/filebrowser-entrypoint
 
-printf "✅ File Browser installed!\n\n"
-printf "🚀 Run 'filebrowser-entrypoint' to start the service\n\n"
+printf "🥳 Installation complete!\n\n"
