create-claude-docker 1.0.2 → 1.0.4

package/README.md

@@ -181,13 +181,13 @@ ZAI_API_KEY=your-zai-api-key-here
 
 ### Default Configuration
 
-The container **automatically generates** `settings.json` on every startup using your API key from `.env`.
+The API key is **injected directly as an environment variable** (`ANTHROPIC_AUTH_TOKEN`) in `docker-compose.yml`.
 
-- **API key injection**: The entrypoint script reads `ZAI_API_KEY` (or `ANTHROPIC_API_KEY`) and creates a properly configured `settings.json`
-- **Agents**: Pre-defined agent configurations from `.claude/agents/` are copied on first run
-- **Persistence**: Settings are stored in `./claude-data/` volume
-
-**Important:** Changes to `./claude-data/settings.json` will be overwritten on container restart. To persist custom settings, modify `.docker/entrypoint.sh`.
+- **API key injection**: The `docker-compose.yml` passes `ANTHROPIC_AUTH_TOKEN` from your `.env` (supports both `ZAI_API_KEY` and `ANTHROPIC_API_KEY`)
+- **Why env var?** Settings from `settings.json` may be mounted over by the `claude-data` volume before the entrypoint can write them. Using direct env vars ensures the API key is always available.
+- **Model configuration**: Model mappings and base URL are stored in `.claude/settings.json`
+- **Agents**: Pre-defined agent configurations from `.claude/agents/` are available immediately
+- **Persistence**: Claude Code state is stored in `./claude-data/` volume (gitignored)
 
 ### Git Integration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-docker",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Create Docker-based Claude Code development environment with Z.AI GLM-4.7 support",
   "author": "Szymon <szymon@fishinthenet.com>",
   "license": "MIT",

package/template/.claude/settings.json

@@ -3,7 +3,6 @@
     "ANTHROPIC_DEFAULT_HAIKU_MODEL": "glm-4.5-air",
     "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-4.7",
     "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-4.7",
-    "ANTHROPIC_AUTH_TOKEN": "${ANTHROPIC_API_KEY}",
     "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
     "API_TIMEOUT_MS": "3000000"
   },
@@ -18,4 +17,4 @@
       "Bash(git:*)"
     ]
   }
-}
+}

package/template/.docker/entrypoint.sh

@@ -56,70 +56,41 @@ fi
 
 echo "✅ Onboarding bypass configured (both locations)"
 
-# ALWAYS regenerate settings.json with current environment variables
-# This ensures the API key from .env is properly injected
-echo "🔧 Configuring Claude Code settings..."
+# API key is now passed directly via ANTHROPIC_AUTH_TOKEN environment variable
+# in docker-compose.yml (not via settings.json) to avoid volume mount race condition
+echo "🔧 Checking Claude Code configuration..."
 
-# Determine API key (ZAI_API_KEY takes precedence over ANTHROPIC_API_KEY)
+# Determine API key status
 API_KEY="${ZAI_API_KEY:-$ANTHROPIC_API_KEY}"
+AUTH_TOKEN="${ANTHROPIC_AUTH_TOKEN:-}"
 
-if [ -n "$API_KEY" ]; then
-    cat > "$SETTINGS_FILE" << EOF
-{
-  "env": {
-    "ANTHROPIC_DEFAULT_HAIKU_MODEL": "glm-4.5-air",
-    "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-4.7",
-    "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-4.7",
-    "ANTHROPIC_AUTH_TOKEN": "$API_KEY",
-    "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
-    "API_TIMEOUT_MS": "3000000",
-    "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1"
-  },
-  "permissions": {
-    "allow": [
-      "WebSearch",
-      "Bash(curl:*)",
-      "Bash(python3:*)",
-      "Bash(npm:*)",
-      "Bash(node:*)",
-      "Bash(mkdir:*)",
-      "Bash(git:*)"
-    ]
-  }
-}
-EOF
-    echo "✅ Claude Code configured with Z.AI API key"
+if [ -n "$AUTH_TOKEN" ]; then
+    echo "✅ ANTHROPIC_AUTH_TOKEN is set (via docker-compose.yml)"
+elif [ -n "$API_KEY" ]; then
+    echo "⚠️  API key found in env but ANTHROPIC_AUTH_TOKEN not set"
+    echo "   This may indicate a docker-compose.yml configuration issue"
 else
     echo "⚠️  WARNING: No API key found!"
     echo "   Please set ANTHROPIC_API_KEY or ZAI_API_KEY in your .env file"
-    # Create settings without API key (will fail authentication but shows config is working)
-    cat > "$SETTINGS_FILE" << EOF
-{
-  "env": {
-    "ANTHROPIC_DEFAULT_HAIKU_MODEL": "glm-4.5-air",
-    "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-4.7",
-    "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-4.7",
-    "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
-    "API_TIMEOUT_MS": "3000000",
-    "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1"
-  },
-  "permissions": {
-    "allow": [
-      "WebSearch",
-      "Bash(curl:*)",
-      "Bash(python3:*)",
-      "Bash(npm:*)",
-      "Bash(node:*)",
-      "Bash(mkdir:*)",
-      "Bash(git:*)"
-    ]
-  }
-}
-EOF
 fi
 
-echo "📋 Current settings.json:"
-cat "$SETTINGS_FILE" | sed 's/"ANTHROPIC_AUTH_TOKEN": "[^"]*"/"ANTHROPIC_AUTH_TOKEN": "***HIDDEN***"/g'
+# Copy default settings.json if not exists in mounted volume
+if [ ! -f "$SETTINGS_FILE" ]; then
+    if [ -f "$CLAUDE_DEFAULTS/settings.json" ]; then
+        echo "📁 Copying default settings.json..."
+        cp "$CLAUDE_DEFAULTS/settings.json" "$SETTINGS_FILE"
+    fi
+fi
+
+echo "📋 Environment check:"
+echo "   ANTHROPIC_AUTH_TOKEN: ${AUTH_TOKEN:+***SET***}${AUTH_TOKEN:-NOT SET}"
+echo "   ANTHROPIC_BASE_URL: ${ANTHROPIC_BASE_URL:-NOT SET}"
+
+if [ -f "$SETTINGS_FILE" ]; then
+    echo "📋 Settings file exists at: $SETTINGS_FILE"
+else
+    echo "⚠️  No settings.json found"
+fi
 
 echo "📋 Current ~/.claude.json:"
 cat "$CLAUDE_JSON_FILE"

package/template/docker-compose.yml

@@ -7,6 +7,9 @@ services:
       # API keys - ZAI_API_KEY takes precedence if both are set
       - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-}
       - ZAI_API_KEY=${ZAI_API_KEY:-}
+      # CRITICAL: This is the actual token Claude Code uses for authentication
+      # Must be set directly as env var because settings.json gets mounted over by volume
+      - ANTHROPIC_AUTH_TOKEN=${ZAI_API_KEY:-${ANTHROPIC_API_KEY:-}}
       # Terminal type for proper rendering
       - TERM=xterm-256color
     volumes: