Fix CVEs: install gosu from GitHub release instead of Debian package (Go 1.19.8 → current)

.env.example

@@ -10,7 +10,7 @@ OPENCODE_PROVIDER=anthropic
 # OPENCODE_MODEL=anthropic/claude-sonnet-4-5
 
 # ── API Keys (set the one matching your provider) ────────────────────
-ANTHROPIC_API_KEY=
+# ANTHROPIC_API_KEY=
 # OPENAI_API_KEY=
 # GEMINI_API_KEY=
 

.gitea/workflows/docker-publish.yml

@@ -41,3 +41,19 @@ jobs:
           tags: |
             ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:${{ steps.version.outputs.version }}
             ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:latest
+
+      - name: Update Docker Hub description
+        run: |
+          TOKEN=$(curl -s -X POST https://hub.docker.com/v2/users/login/ \
+            -H "Content-Type: application/json" \
+            -d '{"username":"${{ vars.DOCKERHUB_USERNAME }}","password":"${{ secrets.DOCKERHUB_TOKEN }}"}' \
+            | jq -r .token)
+          jq -n \
+            --arg full "$(cat DOCKER_HUB.md)" \
+            --arg short "Portable AI dev environment for opencode. Debian-based with git, Node.js, AWS CLI, and SSH support." \
+            '{"full_description": $full, "description": $short}' | \
+            curl -s -o /dev/null -w "%{http_code}" -X PATCH \
+              "https://hub.docker.com/v2/repositories/${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox/" \
+              -H "Authorization: JWT $TOKEN" \
+              -H "Content-Type: application/json" \
+              -d @-

DOCKER_HUB.md

@@ -32,8 +32,35 @@ docker run -it --rm \
 
 Then run `opencode` when ready.
 
+## Running Multiple Shells
+
+Once opencode is running it takes over the terminal. To have a separate shell for `aws`, `git`, or other commands, run the container in the background and attach multiple times:
+
+```bash
+# Start in background
+docker run -d --name devbox \
+  -e ANTHROPIC_API_KEY=your-key \
+  -e OPENCODE_PROVIDER=anthropic \
+  -v ~/projects:/workspace \
+  -v ~/.ssh:/home/developer/.ssh:ro \
+  joakimp/opencode-devbox:latest sleep infinity
+
+# Shell 1: run opencode
+docker exec -it -u developer devbox opencode
+
+# Shell 2 (separate terminal): aws, git, etc.
+docker exec -it -u developer devbox bash
+
+# When done
+docker rm -f devbox
+```
+
+> **Note:** Always use `-u developer` with `docker exec` — the container starts as root for UID adjustment, then drops to `developer`. Without `-u developer`, exec runs as root.
+
 ## Environment Variables
 
+All configuration is done via environment variables, typically stored in a `.env` file.
+
 ### Provider Configuration
 
 | Variable | Description | Default |
@@ -56,14 +83,7 @@ Set the key matching your provider:
 | Variable | Description | Default |
 |---|---|---|
 | `AWS_REGION` | AWS region | `us-east-1` |
-| `AWS_PROFILE` | AWS profile name | `default` |
+| `AWS_PROFILE` | AWS SSO profile name | `default` |
-
-For SSO authentication, start with `bash` and run:
-
-```bash
-aws sso login --sso-session <your-session> --use-device-code
-opencode
-```
 
 ### Git
 
@@ -72,26 +92,96 @@ opencode
 | `GIT_USER_NAME` | Git commit author name |
 | `GIT_USER_EMAIL` | Git commit author email |
 
-## Volumes
+### User ID Mapping
 
-| Host Path | Container Path | Purpose |
+The container runs as user `developer` (UID 1000 by default). If your host user has a different UID, file permission mismatches can occur on mounted volumes.
+
+The entrypoint automatically detects the owner of `/workspace` and adjusts the container user's UID/GID to match. You can also set it explicitly:
+
+| Variable | Description | Default |
 |---|---|---|
-| Your project directory | `/workspace` | Code you want to work on |
+| `USER_UID` | Container user UID | Auto-detect from `/workspace` owner |
-| `~/.ssh` | `/home/developer/.ssh:ro` | SSH keys for git (read-only) |
+| `USER_GID` | Container user GID | Auto-detect from `/workspace` owner |
-| (optional) `~/.aws` | `/home/developer/.aws:ro` | AWS credentials/config |
-| (optional) Custom config | `/home/developer/.config/opencode/opencode.json:ro` | Full opencode config with MCP servers, etc. |
 
-### Persisting opencode data
+## Initial Setup
 
-To keep opencode state (session history, memory) between runs, add a named volume:
+### 1. Create a project directory
 
 ```bash
-docker run -it --rm \
+mkdir -p ~/projects
-  -v opencode-data:/home/developer/.local/share/opencode \
-  ... \
-  joakimp/opencode-devbox:latest
 ```
 
+### 2. Create a `.env` file
+
+Create a `.env` file with your configuration. Examples for each provider:
+
+**Anthropic:**
+```bash
+OPENCODE_PROVIDER=anthropic
+ANTHROPIC_API_KEY=sk-ant-...
+GIT_USER_NAME=Your Name
+GIT_USER_EMAIL=you@example.com
+```
+
+**OpenAI:**
+```bash
+OPENCODE_PROVIDER=openai
+OPENAI_API_KEY=sk-...
+GIT_USER_NAME=Your Name
+GIT_USER_EMAIL=you@example.com
+```
+
+**AWS Bedrock (SSO):**
+```bash
+OPENCODE_PROVIDER=amazon-bedrock
+OPENCODE_MODEL=amazon-bedrock/anthropic.claude-sonnet-4-5-v1
+AWS_REGION=eu-west-1
+AWS_PROFILE=your-profile-name
+GIT_USER_NAME=Your Name
+GIT_USER_EMAIL=you@example.com
+```
+
+### 3. AWS SSO setup (Bedrock users only)
+
+AWS SSO requires a `~/.aws/config` file on the host with your SSO session configuration. If you already have this on another machine, copy it:
+
+```bash
+scp -r user@other-machine:~/.aws ~/.aws
+```
+
+Or configure from scratch:
+
+```bash
+aws configure sso
+```
+
+You'll be prompted for:
+- SSO session name
+- SSO start URL
+- SSO region
+- Registration scopes (typically `sso:account:access`)
+
+The `~/.aws` directory must be mounted into the container (see docker-compose example below).
+
+## Data Storage and Persistence
+
+Understanding what survives container restarts and what doesn't:
+
+| Path in container | Source | Survives restart? | Contains |
+|---|---|---|---|
+| `/workspace` | Host bind mount | ✅ Yes — lives on host | Your project files |
+| `/home/developer/.ssh` | Host bind mount (ro) | ✅ Yes — lives on host | SSH keys |
+| `/home/developer/.aws` | Host bind mount | ✅ Yes — lives on host | AWS credentials/SSO cache |
+| `/home/developer/.local/share/opencode` | Named volume (if configured) | ✅ Yes — Docker volume | Session history, memory, auth tokens |
+| `/home/developer/.config/opencode/opencode.json` | Generated by entrypoint | ❌ No — regenerated each start | Provider config, MCP server definitions |
+
+### Key points
+
+- **Project files** (`/workspace`) are always safe — they're your host filesystem.
+- **opencode config** is auto-generated from `OPENCODE_PROVIDER` env var on each start. It only sets provider and model — no MCP servers. To persist MCP server config, mount your own config file (see Custom opencode Config below).
+- **opencode data** (session history, memory) is lost with `--rm` unless you add a named volume.
+- **AWS SSO tokens** persist across restarts when `~/.aws` is mounted (recommended for Bedrock users).
+
 ## Custom opencode Config
 
 For full control (MCP servers, custom models, keybindings), mount your own config:
@@ -107,7 +197,24 @@ When a config file is mounted, the `OPENCODE_PROVIDER` auto-config is skipped.
 
 ## Using docker-compose
 
-Create a `docker-compose.yml`:
+Create a directory with a `docker-compose.yml` and a `.env` file:
+
+```bash
+mkdir opencode-devbox && cd opencode-devbox
+```
+
+`.env` — your settings (never commit this):
+
+```bash
+OPENCODE_PROVIDER=amazon-bedrock
+OPENCODE_MODEL=amazon-bedrock/anthropic.claude-sonnet-4-5-v1
+AWS_REGION=eu-west-1
+AWS_PROFILE=your-profile-name
+GIT_USER_NAME=Your Name
+GIT_USER_EMAIL=you@example.com
+```
+
+`docker-compose.yml`:
 
 ```yaml
 services:
@@ -115,24 +222,45 @@ services:
     image: joakimp/opencode-devbox:latest
     stdin_open: true
     tty: true
+    env_file:
+      - .env
     environment:
       - TERM=xterm-256color
-      - OPENCODE_PROVIDER=anthropic
-      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
-      - GIT_USER_NAME=${GIT_USER_NAME}
-      - GIT_USER_EMAIL=${GIT_USER_EMAIL}
     volumes:
       - ~/projects:/workspace
       - ~/.ssh:/home/developer/.ssh:ro
       - devbox-data:/home/developer/.local/share/opencode
+      # Mount AWS config for Bedrock SSO (required for amazon-bedrock provider)
+      # - ~/.aws:/home/developer/.aws
+      # Optional: mount your own opencode config (MCP servers, custom models, etc.)
+      # - ./opencode.json:/home/developer/.config/opencode/opencode.json:ro
+      # Optional: mount opencode skills from host
+      # - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
+      # - ~/.agents/skills:/home/developer/.agents/skills:ro
 
 volumes:
   devbox-data:
 ```
 
+Docker Compose loads `.env` automatically from the same directory. All variables from `.env` are passed to the container via `env_file`. Do **not** hardcode provider settings in the `environment:` section — use `.env` instead.
+
 Then:
 
 ```bash
+# Start in background
+docker compose up -d
+
+# Open a shell (always use -u developer with exec)
+docker compose exec -u developer devbox bash
+
+# For Bedrock: authenticate, then start opencode
+aws sso login --sso-session <your-session> --use-device-code
+opencode
+
+# Or run opencode directly (if no SSO needed)
+docker compose exec -u developer devbox opencode
+
+# One-shot mode (creates and removes container)
 docker compose run --rm devbox        # direct to opencode
 docker compose run --rm devbox bash   # interactive shell
 ```
@@ -144,7 +272,7 @@ docker compose run --rm devbox bash   # interactive shell
 - **Node.js 22** — for npx-based MCP servers
 - **AWS CLI v2** — SSO and Bedrock authentication
 - **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, jq, curl, wget, vim, tree
-- **Non-root user** — runs as `developer` (UID 1000) with sudo access
+- **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available)
 
 ## Source
 

Dockerfile

@@ -5,7 +5,7 @@ ARG DEBIAN_VERSION=bookworm-slim
 FROM debian:${DEBIAN_VERSION} AS base
 
 ARG TARGETARCH
-ARG OPENCODE_VERSION=1.4.2
+ARG OPENCODE_VERSION=1.4.3
 
 LABEL maintainer="joakimp"
 LABEL description="Portable opencode developer container"
@@ -37,6 +37,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && ln -s /usr/bin/fdfind /usr/local/bin/fd \
     && rm -rf /var/lib/apt/lists/*
 
+# ── gosu (install from GitHub for current Go version, avoids CVEs in Debian package)
+ARG GOSU_VERSION=1.17
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;; *) echo "amd64" ;; esac) && \
+    curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${ARCH}" -o /usr/local/bin/gosu && \
+    chmod +x /usr/local/bin/gosu && \
+    gosu --version
+
 # Set locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8
@@ -95,16 +102,18 @@ RUN groupadd --gid ${USER_GID} ${USER_NAME} && \
 
 # Create standard directories
 RUN mkdir -p /workspace \
-    /home/${USER_NAME}/.config/opencode \
+    /home/${USER_NAME}/.config/opencode/skills \
+    /home/${USER_NAME}/.agents/skills \
     /home/${USER_NAME}/.local/share/opencode \
     /home/${USER_NAME}/.ssh && \
     chown -R ${USER_NAME}:${USER_NAME} /workspace /home/${USER_NAME}
 
 # ── Entrypoint ────────────────────────────────────────────────────────
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
+COPY entrypoint-user.sh /usr/local/bin/entrypoint-user.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh /usr/local/bin/entrypoint-user.sh
 
-USER ${USER_NAME}
+# Start as root — entrypoint adjusts UID/GID then drops to developer
 WORKDIR /workspace
 
 ENTRYPOINT ["entrypoint.sh"]

README.md

@@ -18,7 +18,7 @@ cp .env.example .env
 # Edit .env with your provider, API key, workspace path, git config
 
 # Install git hooks (secret scanning)
-brew install gitleaks  # one-time
+brew install gitleaks  # macOS / Linuxbrew
 ./setup-hooks.sh
 
 # Build and run
@@ -32,7 +32,7 @@ docker compose run --rm devbox
 - **Host filesystem access** — bind mount any directory as `/workspace`
 - **SSH key forwarding** — git push/pull to private repos
 - **MCP server support** — Node.js included for `npx`-based MCP servers
-- **Non-root user** — runs as `developer` (UID 1000) with sudo
+- **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available)
 - **Optional runtimes** — Python, Go via build args (Node.js always included — required for opencode v1.x)
 - **AWS CLI v2** — built-in SSO/Bedrock authentication with headless device-code flow
 - **Multi-arch** — amd64 and arm64
@@ -76,10 +76,10 @@ docker compose run --rm devbox
 docker compose up -d
 
 # Attach a shell to the running container
-docker compose exec devbox bash
+docker compose exec -u developer devbox bash
 
 # Or run a single command inside it
-docker compose exec devbox aws --version
+docker compose exec -u developer devbox aws --version
 ```
 
 > `run` creates a new container (cleaned up with `--rm`). `exec` attaches to an already running one.
@@ -95,10 +95,13 @@ docker compose exec devbox aws --version
 | `ANTHROPIC_API_KEY` | Anthropic API key | — |
 | `OPENAI_API_KEY` | OpenAI API key | — |
 | `AWS_REGION` | AWS region for Bedrock | `us-east-1` |
+| `AWS_PROFILE` | AWS SSO profile name | `default` |
 | `GIT_USER_NAME` | Git commit author name | — |
 | `GIT_USER_EMAIL` | Git commit author email | — |
 | `WORKSPACE_PATH` | Host path to mount | `.` |
 | `SSH_KEY_PATH` | Host SSH key directory | `~/.ssh` |
+| `USER_UID` | Override container user UID | Auto-detect from `/workspace` |
+| `USER_GID` | Override container user GID | Auto-detect from `/workspace` |
 
 ### Custom opencode config
 
@@ -109,6 +112,16 @@ volumes:
   - ./my-opencode.json:/home/developer/.config/opencode/opencode.json:ro
 ```
 
+### Custom skills
+
+Mount your host's opencode skills into the container:
+
+```yaml
+volumes:
+  - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
+  - ~/.agents/skills:/home/developer/.agents/skills:ro
+```
+
 ### Rebuilding the Image
 
 `docker compose run` and `docker compose up` use the existing image — they **do not rebuild** when you change the Dockerfile or build args (e.g. updating `OPENCODE_VERSION`). Rebuild explicitly:
@@ -138,11 +151,40 @@ docker compose build --build-arg OPENCODE_VERSION=1.5.0
 
 ## AWS Bedrock Authentication
 
-When using AWS Bedrock as your LLM provider, you need to authenticate via AWS SSO from inside the container. Since the container runs headless (no browser), use the device-code flow:
+When using AWS Bedrock as your LLM provider, you need:
+
+### 1. AWS config on the host
+
+The container needs access to your `~/.aws/config` with SSO session configuration. If you already have this on another machine, copy it:
 
 ```bash
-# Start the container interactively
+scp -r user@other-machine:~/.aws ~/.aws
-docker compose run --rm devbox bash
+```
+
+Or configure from scratch on the host:
+
+```bash
+aws configure sso
+```
+
+### 2. Mount `~/.aws` into the container
+
+Uncomment the AWS volume mount in `docker-compose.yml`:
+
+```yaml
+- ~/.aws:/home/developer/.aws
+```
+
+Note: do **not** use `:ro` — SSO writes token cache files to this directory.
+
+### 3. Authenticate inside the container
+
+Since the container runs headless (no browser), use the device-code flow:
+
+```bash
+# Start the container
+docker compose up -d
+docker compose exec -u developer devbox bash
 
 # Authenticate — prints a URL and code you open in your local browser
 aws sso login --sso-session <your-sso-session> --use-device-code
@@ -153,7 +195,7 @@ opencode
 
 The `--use-device-code` flag outputs a URL and short code instead of trying to open a browser. Copy the URL into any browser (on your laptop, phone, etc.), enter the code, and complete the 2FA flow. The CLI in the container picks up the session automatically.
 
-SSO sessions typically last 8–12 hours before requiring re-authentication.
+SSO sessions typically last 8–12 hours before requiring re-authentication. Since `~/.aws` is mounted from the host, tokens persist across container restarts.
 
 ## Secret Scanning
 
@@ -162,8 +204,11 @@ A [gitleaks](https://github.com/gitleaks/gitleaks) pre-commit hook prevents acci
 ### Setup
 
 ```bash
-brew install gitleaks   # one-time install
+# macOS / Linuxbrew
-./setup-hooks.sh        # installs the pre-commit hook
+brew install gitleaks
+
+# Debian/Ubuntu (download binary)
+curl -sSL https://github.com/gitleaks/gitleaks/releases/latest/download/gitleaks_$(uname -s)_$(uname -m).tar.gz | sudo tar -xz -C /usr/local/bin gitleaks
 ```
 
 The hook runs automatically on every `git commit`. If gitleaks isn't installed, the hook prints a warning and allows the commit (no hard dependency on collaborators).
@@ -186,6 +231,7 @@ Allowlisted paths and rules are in `.gitleaks.toml`. The defaults extend gitleak
 Host Machine
 ├── ~/projects/my-app  ──bind mount──▶  /workspace (container)
 ├── ~/.ssh             ──bind mount──▶  /home/developer/.ssh (ro)
+├── ~/.aws             ──bind mount──▶  /home/developer/.aws (Bedrock SSO)
 └── .env               ──env vars───▶  provider config + API keys
 
 Container (Debian bookworm)
@@ -193,10 +239,22 @@ Container (Debian bookworm)
 ├── AWS CLI v2 (SSO + Bedrock auth)
 ├── git, ssh, ripgrep, fd, jq, curl, fzf
 ├── Node.js (for MCP servers)
-├── entrypoint.sh (SSH perms, git config, provider setup)
+├── entrypoint.sh (UID adjustment, git config, provider setup)
 └── /workspace ← your code lives here
 ```
 
+### Data persistence
+
+| Path in container | Source | Survives `--rm`? | Contains |
+|---|---|---|---|
+| `/workspace` | Host bind mount | ✅ Yes | Your project files |
+| `/home/developer/.ssh` | Host bind mount (ro) | ✅ Yes | SSH keys |
+| `/home/developer/.aws` | Host bind mount (if configured) | ✅ Yes | AWS credentials/SSO cache |
+| `/home/developer/.local/share/opencode` | Named volume `devbox-data` | ✅ Yes | Session history, memory |
+| `/home/developer/.config/opencode/opencode.json` | Generated by entrypoint | ❌ No | Provider/model config |
+
+**opencode config** (`opencode.json`) is auto-generated from `OPENCODE_PROVIDER` on each start. It sets provider and model only — no MCP servers. To use MCP servers or custom settings, mount your own config file (see Custom opencode config above).
+
 ## License
 
 MIT

docker-compose.yml

@@ -3,7 +3,7 @@
 # Usage:
 #   cp .env.example .env    # configure your provider and keys
 #   docker compose up -d
-#   docker compose exec devbox opencode
+#   docker compose exec -u developer devbox opencode
 #
 # Or for interactive one-shot:
 #   docker compose run --rm devbox
@@ -30,14 +30,18 @@ services:
       # SSH keys (read-only) — for git push/pull
       - ${SSH_KEY_PATH:-~/.ssh}:/home/developer/.ssh:ro
 
-      # Optional: mount your own opencode config
+      # Optional: mount your own opencode config (MCP servers, custom models, etc.)
-      # - ./config/opencode.json:/home/developer/.config/opencode/opencode.json:ro
+      # - ./opencode.json:/home/developer/.config/opencode/opencode.json:ro
+
+      # Optional: mount opencode skills from host
+      # - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
+      # - ~/.agents/skills:/home/developer/.agents/skills:ro
 
       # Optional: persist opencode data (auth, memory, etc.)
       - devbox-data:/home/developer/.local/share/opencode
 
-      # Optional: AWS credentials for Bedrock
+      # Optional: AWS credentials/SSO config (not read-only — SSO writes token cache)
-      # - ~/.aws:/home/developer/.aws:ro
+      # - ~/.aws:/home/developer/.aws
 
 volumes:
   devbox-data:

entrypoint-user.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ── Git config defaults ──────────────────────────────────────────────
+if [ -n "${GIT_USER_NAME:-}" ] && ! git config --global user.name &>/dev/null; then
+  git config --global user.name "$GIT_USER_NAME"
+fi
+if [ -n "${GIT_USER_EMAIL:-}" ] && ! git config --global user.email &>/dev/null; then
+  git config --global user.email "$GIT_USER_EMAIL"
+fi
+
+# ── Generate opencode config from env vars if no config mounted ──────
+CONFIG_DIR="$HOME/.config/opencode"
+CONFIG_FILE="$CONFIG_DIR/opencode.json"
+
+if [ ! -f "$CONFIG_FILE" ] && [ -n "${OPENCODE_PROVIDER:-}" ]; then
+  echo "Generating opencode config for provider: $OPENCODE_PROVIDER"
+  mkdir -p "$CONFIG_DIR"
+
+  case "$OPENCODE_PROVIDER" in
+    anthropic)
+      cat > "$CONFIG_FILE" <<EOF
+{
+  "\$schema": "https://opencode.ai/config.json",
+  "model": "${OPENCODE_MODEL:-anthropic/claude-sonnet-4-5}",
+  "share": "disabled",
+  "autoupdate": false
+}
+EOF
+      ;;
+    openai)
+      cat > "$CONFIG_FILE" <<EOF
+{
+  "\$schema": "https://opencode.ai/config.json",
+  "model": "${OPENCODE_MODEL:-openai/gpt-4o}",
+  "share": "disabled",
+  "autoupdate": false
+}
+EOF
+      ;;
+    amazon-bedrock)
+      cat > "$CONFIG_FILE" <<EOF
+{
+  "\$schema": "https://opencode.ai/config.json",
+  "model": "${OPENCODE_MODEL:-amazon-bedrock/anthropic.claude-sonnet-4-5-v1}",
+  "share": "disabled",
+  "autoupdate": false,
+  "provider": {
+    "amazon-bedrock": {
+      "options": {
+        "region": "${AWS_REGION:-us-east-1}"
+      }
+    }
+  }
+}
+EOF
+      ;;
+    *)
+      cat > "$CONFIG_FILE" <<EOF
+{
+  "\$schema": "https://opencode.ai/config.json",
+  "model": "${OPENCODE_MODEL:-anthropic/claude-sonnet-4-5}",
+  "share": "disabled",
+  "autoupdate": false
+}
+EOF
+      ;;
+  esac
+fi
+
+# ── Execute command ──────────────────────────────────────────────────
+exec "$@"

entrypoint.sh

@@ -1,84 +1,50 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+USER_NAME="developer"
+CURRENT_UID=$(id -u "$USER_NAME")
+CURRENT_GID=$(id -g "$USER_NAME")
+
+# ── UID/GID adjustment ───────────────────────────────────────────────
+# Priority: env vars > auto-detect from /workspace > default (1000)
+TARGET_UID="${USER_UID:-}"
+TARGET_GID="${USER_GID:-}"
+
+# Auto-detect from /workspace owner if env vars not set
+if [ -z "$TARGET_UID" ] && [ -d /workspace ]; then
+  WORKSPACE_UID=$(stat -c '%u' /workspace 2>/dev/null || stat -f '%u' /workspace 2>/dev/null)
+  WORKSPACE_GID=$(stat -c '%g' /workspace 2>/dev/null || stat -f '%g' /workspace 2>/dev/null)
+  # Only adjust if workspace is owned by a non-root user
+  if [ "$WORKSPACE_UID" != "0" ] && [ "$WORKSPACE_UID" != "$CURRENT_UID" ]; then
+    TARGET_UID="$WORKSPACE_UID"
+    TARGET_GID="${TARGET_GID:-$WORKSPACE_GID}"
+  fi
+fi
+
+# Apply UID/GID changes if needed
+if [ -n "$TARGET_GID" ] && [ "$TARGET_GID" != "$CURRENT_GID" ]; then
+  groupmod -g "$TARGET_GID" "$USER_NAME" 2>/dev/null || true
+  find /home/"$USER_NAME" -not -path "/home/$USER_NAME/.ssh/*" -group "$CURRENT_GID" -exec chgrp "$TARGET_GID" {} + 2>/dev/null || true
+fi
+
+if [ -n "$TARGET_UID" ] && [ "$TARGET_UID" != "$CURRENT_UID" ]; then
+  usermod -u "$TARGET_UID" "$USER_NAME" 2>/dev/null || true
+  find /home/"$USER_NAME" -not -path "/home/$USER_NAME/.ssh/*" -user "$CURRENT_UID" -exec chown "$TARGET_UID" {} + 2>/dev/null || true
+  echo "Adjusted developer UID:GID to $TARGET_UID:${TARGET_GID:-$CURRENT_GID}"
+fi
+
 # ── SSH key permissions ──────────────────────────────────────────────
-# If SSH keys are mounted, fix permissions (bind mounts may have wrong perms)
+# If SSH keys are mounted, fix permissions (skip if read-only mount)
-if [ -d "$HOME/.ssh" ] && [ "$(ls -A "$HOME/.ssh" 2>/dev/null)" ]; then
+if [ -d "/home/$USER_NAME/.ssh" ] && [ "$(ls -A "/home/$USER_NAME/.ssh" 2>/dev/null)" ]; then
-  chmod 700 "$HOME/.ssh"
+  if touch "/home/$USER_NAME/.ssh/.perm_test" 2>/dev/null; then
-  find "$HOME/.ssh" -type f -name "id_*" ! -name "*.pub" -exec chmod 600 {} \; 2>/dev/null || true
+    rm -f "/home/$USER_NAME/.ssh/.perm_test"
-  find "$HOME/.ssh" -type f -name "*.pub" -exec chmod 644 {} \; 2>/dev/null || true
+    chmod 700 "/home/$USER_NAME/.ssh"
-  [ -f "$HOME/.ssh/known_hosts" ] && chmod 644 "$HOME/.ssh/known_hosts"
+    find "/home/$USER_NAME/.ssh" -type f -name "id_*" ! -name "*.pub" -exec chmod 600 {} \; 2>/dev/null || true
-  [ -f "$HOME/.ssh/config" ] && chmod 600 "$HOME/.ssh/config"
+    find "/home/$USER_NAME/.ssh" -type f -name "*.pub" -exec chmod 644 {} \; 2>/dev/null || true
+    [ -f "/home/$USER_NAME/.ssh/known_hosts" ] && chmod 644 "/home/$USER_NAME/.ssh/known_hosts"
+    [ -f "/home/$USER_NAME/.ssh/config" ] && chmod 600 "/home/$USER_NAME/.ssh/config"
+  fi
 fi
 
-# ── Git config defaults ──────────────────────────────────────────────
+# ── Drop to developer user for remaining setup ──────────────────────
-# Set git config from env vars if not already configured via mounted .gitconfig
+exec gosu "$USER_NAME" /usr/local/bin/entrypoint-user.sh "$@"
-if [ -n "${GIT_USER_NAME:-}" ] && ! git config --global user.name &>/dev/null; then
-  git config --global user.name "$GIT_USER_NAME"
-fi
-if [ -n "${GIT_USER_EMAIL:-}" ] && ! git config --global user.email &>/dev/null; then
-  git config --global user.email "$GIT_USER_EMAIL"
-fi
-
-# ── Generate opencode config from env vars if no config mounted ──────
-CONFIG_DIR="$HOME/.config/opencode"
-CONFIG_FILE="$CONFIG_DIR/opencode.json"
-
-if [ ! -f "$CONFIG_FILE" ] && [ -n "${OPENCODE_PROVIDER:-}" ]; then
-  echo "Generating opencode config for provider: $OPENCODE_PROVIDER"
-  mkdir -p "$CONFIG_DIR"
-
-  # Build provider-specific config
-  case "$OPENCODE_PROVIDER" in
-    anthropic)
-      cat > "$CONFIG_FILE" <<EOF
-{
-  "\$schema": "https://opencode.ai/config.json",
-  "model": "${OPENCODE_MODEL:-anthropic/claude-sonnet-4-5}",
-  "share": "disabled",
-  "autoupdate": false
-}
-EOF
-      ;;
-    openai)
-      cat > "$CONFIG_FILE" <<EOF
-{
-  "\$schema": "https://opencode.ai/config.json",
-  "model": "${OPENCODE_MODEL:-openai/gpt-4o}",
-  "share": "disabled",
-  "autoupdate": false
-}
-EOF
-      ;;
-    amazon-bedrock)
-      cat > "$CONFIG_FILE" <<EOF
-{
-  "\$schema": "https://opencode.ai/config.json",
-  "model": "${OPENCODE_MODEL:-amazon-bedrock/anthropic.claude-sonnet-4-5-v1}",
-  "share": "disabled",
-  "autoupdate": false,
-  "provider": {
-    "amazon-bedrock": {
-      "options": {
-        "region": "${AWS_REGION:-us-east-1}"
-      }
-    }
-  }
-}
-EOF
-      ;;
-    *)
-      cat > "$CONFIG_FILE" <<EOF
-{
-  "\$schema": "https://opencode.ai/config.json",
-  "model": "${OPENCODE_MODEL:-anthropic/claude-sonnet-4-5}",
-  "share": "disabled",
-  "autoupdate": false
-}
-EOF
-      ;;
-  esac
-fi
-
-# ── Execute command ──────────────────────────────────────────────────
-exec "$@"

setup-hooks.sh

@@ -13,7 +13,8 @@ cat > "$HOOK_DIR/pre-commit" << 'HOOK'
 if ! command -v gitleaks >/dev/null 2>&1; then
   echo ""
   echo "⚠️  gitleaks is not installed — skipping secret scan"
-  echo "   Install: brew install gitleaks"
+  echo "   Install: brew install gitleaks  (macOS)"
+  echo "   Or: curl -sSL https://github.com/gitleaks/gitleaks/releases/latest/download/gitleaks_\$(uname -s)_\$(uname -m).tar.gz | sudo tar -xz -C /usr/local/bin gitleaks"
   echo ""
   exit 0
 fi