Share a chosen workspace folder and stop with the window
run.sh asks which host folder Claude may access, using the desktop's folder picker (zenity, or kdialog on KDE; terminal prompt otherwise), and mounts it read-write at /workspace. It opens at the last folder used, refuses / and $HOME, and can be skipped with --workspace DIR. The image creates /workspace and a ~/workspace symlink to it. Closing Claude Desktop's window only hides the app, which left the container running invisibly. The new entrypoint launch-claude.sh watches the app's X windows and quits it once none is open or minimized, so the container exits with it. run.sh adds --init for signal handling and reaping. Also add .gitignore for workspace/ and .env. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5.5
@@ -1,27 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
# Start the Claude Desktop container, forwarding the host's X server.
|
||||
# Before launching, verify that a window from the container can actually be
|
||||
# drawn on the host display.
|
||||
# drawn on the host display. Asks (in a folder picker) which host folder to
|
||||
# share with Claude; it is mounted read-write at /workspace in the container.
|
||||
#
|
||||
# Usage: ./run.sh [--build] [--check-only]
|
||||
# --build rebuild the image even if it exists
|
||||
# --check-only run the display check and exit without starting Claude
|
||||
# Usage: ./run.sh [--build] [--check-only] [--workspace DIR]
|
||||
# --build rebuild the image even if it exists
|
||||
# --check-only run the display check and exit without starting Claude
|
||||
# --workspace DIR share DIR without asking (also: WORKSPACE=DIR)
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
IMAGE="${IMAGE:-claude-re-setup:latest}"
|
||||
CONTAINER="${CONTAINER:-claude-desktop}"
|
||||
RUNTIME="${RUNTIME:-docker}"
|
||||
WORKSPACE="${WORKSPACE:-}"
|
||||
|
||||
script_dir="$(dirname "$(readlink -f "$0")")"
|
||||
state_dir="${XDG_STATE_HOME:-$HOME/.local/state}/claude-re-setup"
|
||||
last_workspace_file="$state_dir/last_workspace"
|
||||
|
||||
build=0
|
||||
check_only=0
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
while (( $# )); do
|
||||
case "$1" in
|
||||
--build) build=1 ;;
|
||||
--check-only) check_only=1 ;;
|
||||
-h|--help) sed -n '2,9p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
|
||||
*) echo "Unknown argument: $arg" >&2; exit 2 ;;
|
||||
--workspace) [[ $# -ge 2 ]] || { echo "--workspace needs a directory" >&2; exit 2; }
|
||||
WORKSPACE="$2"; shift ;;
|
||||
--workspace=*) WORKSPACE="${1#*=}" ;;
|
||||
-h|--help) sed -n '2,10p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
|
||||
*) echo "Unknown argument: $1" >&2; exit 2 ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
die() { echo "error: $*" >&2; exit 1; }
|
||||
@@ -58,13 +69,14 @@ if (( build )) || ! "$RUNTIME" image inspect "$IMAGE" >/dev/null 2>&1; then
|
||||
"$RUNTIME" build \
|
||||
--build-arg USER_UID="$(id -u)" \
|
||||
--build-arg USER_GID="$(id -g)" \
|
||||
-t "$IMAGE" "$(dirname "$(readlink -f "$0")")"
|
||||
-t "$IMAGE" "$script_dir"
|
||||
fi
|
||||
|
||||
# label=disable: the X socket and cookie are host files that SELinux would
|
||||
# otherwise block, and relabeling /tmp/.X11-unix with :z would break the host.
|
||||
run_args=(
|
||||
--rm
|
||||
--init
|
||||
--security-opt label=disable
|
||||
--shm-size 1g
|
||||
-e DISPLAY=":${display_num}"
|
||||
@@ -107,10 +119,82 @@ if "$RUNTIME" container inspect "$CONTAINER" >/dev/null 2>&1; then
|
||||
die "container '$CONTAINER' already exists; stop it with: $RUNTIME stop $CONTAINER"
|
||||
fi
|
||||
|
||||
# --- Workspace ---------------------------------------------------------------
|
||||
# The folder Claude can read and write. Chosen in the desktop's own folder
|
||||
# picker (zenity on GNOME, kdialog on KDE), else asked in the terminal.
|
||||
# Default: the last one used, else ./workspace next to this script.
|
||||
ws_title="Choose the folder Claude can access (mounted at /workspace)"
|
||||
|
||||
# Prints the reason a folder can't be shared, or nothing if it's fine.
|
||||
workspace_problem() {
|
||||
case "$1" in
|
||||
/|"$HOME") echo "Sharing $1 would give Claude far more than intended; pick a dedicated folder." ;;
|
||||
*) [[ -w "$1" ]] || echo "$1 is not writable by $(id -un)." ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Shows a folder picker starting in $1; prints the choice, fails on cancel.
|
||||
gui_pick() {
|
||||
if command -v zenity >/dev/null; then
|
||||
zenity --file-selection --directory --title="$ws_title" --filename="$1/" 2>/dev/null
|
||||
elif command -v kdialog >/dev/null; then
|
||||
kdialog --title "$ws_title" --getexistingdirectory "$1" 2>/dev/null
|
||||
else
|
||||
return 2
|
||||
fi
|
||||
}
|
||||
gui_error() {
|
||||
if command -v zenity >/dev/null; then zenity --error --no-wrap --text="$1" 2>/dev/null
|
||||
else kdialog --error "$1" 2>/dev/null; fi
|
||||
}
|
||||
|
||||
if [[ -z "$WORKSPACE" ]]; then
|
||||
default_ws="$script_dir/workspace"
|
||||
[[ -r "$last_workspace_file" ]] && default_ws="$(<"$last_workspace_file")"
|
||||
# The picker needs an existing folder to open in. ./workspace is
|
||||
# git-ignored, so creating it is harmless; a stale last choice falls back.
|
||||
[[ -d "$default_ws" ]] || { default_ws="$script_dir/workspace"; mkdir -p "$default_ws"; }
|
||||
|
||||
if command -v zenity >/dev/null || command -v kdialog >/dev/null; then
|
||||
info "Choose the folder to share in the dialog"
|
||||
while :; do
|
||||
WORKSPACE="$(gui_pick "$default_ws")" || die "no folder chosen; not starting Claude"
|
||||
problem="$(workspace_problem "$(readlink -f "$WORKSPACE")")"
|
||||
[[ -z "$problem" ]] && break
|
||||
gui_error "$problem"
|
||||
done
|
||||
elif [[ -t 0 ]]; then
|
||||
echo "Claude will get read-write access to one folder, mounted at /workspace."
|
||||
read -r -e -p "Folder to share [$default_ws]: " WORKSPACE
|
||||
fi
|
||||
WORKSPACE="${WORKSPACE:-$default_ws}"
|
||||
fi
|
||||
# Expand a leading ~ the way the shell would have.
|
||||
[[ "$WORKSPACE" == "~" || "$WORKSPACE" == "~/"* ]] && WORKSPACE="$HOME${WORKSPACE#\~}"
|
||||
|
||||
if [[ ! -d "$WORKSPACE" ]]; then
|
||||
[[ -e "$WORKSPACE" ]] && die "$WORKSPACE exists but is not a directory"
|
||||
if [[ -t 0 ]]; then
|
||||
read -r -p "$WORKSPACE does not exist. Create it? [Y/n] " answer
|
||||
[[ "${answer:-y}" =~ ^[Yy] ]] || die "no folder to share"
|
||||
fi
|
||||
mkdir -p "$WORKSPACE" || die "could not create $WORKSPACE"
|
||||
fi
|
||||
WORKSPACE="$(readlink -f "$WORKSPACE")"
|
||||
|
||||
problem="$(workspace_problem "$WORKSPACE")"
|
||||
[[ -z "$problem" ]] || die "$problem"
|
||||
|
||||
mkdir -p "$state_dir"
|
||||
printf '%s\n' "$WORKSPACE" > "$last_workspace_file"
|
||||
|
||||
# No config volume: the container is removed on stop (--rm), so the sign-in
|
||||
# is discarded and Claude asks for a login on every start.
|
||||
info "Starting Claude Desktop in container '$CONTAINER'"
|
||||
# No :z on the workspace mount: label=disable already lets the container use
|
||||
# it, and relabeling an arbitrary host folder could break other apps.
|
||||
info "Starting Claude Desktop in container '$CONTAINER' (workspace: $WORKSPACE -> /workspace)"
|
||||
"$RUNTIME" run -d "${run_args[@]}" \
|
||||
--name "$CONTAINER" \
|
||||
-v "$WORKSPACE:/workspace" \
|
||||
"$IMAGE" >/dev/null
|
||||
info "Running. Logs: $RUNTIME logs -f $CONTAINER Stop: $RUNTIME stop $CONTAINER"
|
||||
|
||||
Reference in New Issue
Block a user