Merge pull request #7 from tablackburn/devcontainer-cleanup

refactor: Replace custom Dockerfile with feature-based devcontainer

Author: tablackburn

.devcontainer/Dockerfile

@@ -1,38 +1,30 @@
 {
-  "name": "{{ModuleName}} DevContainer",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".."
+  "name": "PowerShell Claude Code",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "devcontainer",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "initializeCommand": "pwsh -NoProfile -File .devcontainer/setup-host.ps1",
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": false,
+      "installOhMyZsh": false,
+      "username": "vscode",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    },
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/anthropics/devcontainer-features/claude-code:1": {}
   },
   "remoteUser": "vscode",
-  "containerEnv": {
-    "DEVCONTAINER": "true"
-  },
-  "mounts": [
-    "source={{ModuleNameLower}}-pwsh-modules,target=/home/vscode/.local/share/powershell/Modules,type=volume",
-    "source={{ModuleNameLower}}-pwsh-history,target=/home/vscode/.local/share/powershell/PSReadLine,type=volume"
-  ],
-  "postCreateCommand": "pwsh ./build.ps1 -Task Init -Bootstrap",
+  "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && pwsh ./build.ps1 -Task Init -Bootstrap",
   "customizations": {
     "vscode": {
       "extensions": [
-        "ms-vscode.powershell",
-        "anthropic.claude-code"
+        "ms-vscode.powershell"
       ],
       "settings": {
-        "powershell.codeFormatting.preset": "OTBS",
-        "powershell.scriptAnalysis.settingsPath": "./PSScriptAnalyzerSettings.psd1",
         "terminal.integrated.defaultProfile.linux": "pwsh",
-        "terminal.integrated.profiles.linux": {
-          "pwsh": {
-            "path": "/usr/bin/pwsh",
-            "icon": "terminal-powershell"
-          },
-          "bash": {
-            "path": "/bin/bash",
-            "icon": "terminal-bash"
-          }
-        }
+        "powershell.scriptAnalysis.settingsPath": "PSScriptAnalyzerSettings.psd1"
       }
     }
   }

.devcontainer/devcontainer.json

@@ -0,0 +1,14 @@
+# Docker Compose service for the devcontainer.
+# Variables are resolved from .devcontainer/.env, generated by setup-host.ps1.
+services:
+  devcontainer:
+    image: mcr.microsoft.com/powershell:ubuntu-24.04
+    volumes:
+      - ${LOCAL_WORKSPACE_FOLDER}:/workspaces/${LOCAL_WORKSPACE_FOLDER_BASENAME}:cached
+      - gh-cli-config:/home/vscode/.config/gh
+      - ${CLAUDE_HOST_HOME}/.claude:/home/vscode/.claude:cached
+      - ${CLAUDE_HOST_HOME}/.claude.json:/home/vscode/.claude.json:ro
+    command: sleep infinity
+
+volumes:
+  gh-cli-config:

.devcontainer/docker-compose.yml

@@ -0,0 +1,29 @@
+# Resolve host paths for cross-platform devcontainer bind mounts.
+# Writes .devcontainer/.env for docker-compose variable substitution.
+# This runs on the HOST via initializeCommand before the container is created.
+
+$claudeHome = if ($env:USERPROFILE) { $env:USERPROFILE } elseif ($env:HOME) { $env:HOME } else { $null }
+
+if (-not $claudeHome) {
+    Write-Warning 'Could not detect host home directory (neither USERPROFILE nor HOME is set).'
+    Write-Warning 'Claude Code config bind mounts will not be available in the devcontainer.'
+    return
+}
+
+# Resolve the workspace folder (parent of .devcontainer/)
+$workspace = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
+$workspaceName = Split-Path $workspace -Leaf
+
+# Normalize to forward slashes for Docker bind mount compatibility on Windows
+$claudeHome = $claudeHome -replace '\\', '/'
+$workspace = $workspace -replace '\\', '/'
+
+$envContent = @"
+CLAUDE_HOST_HOME="$claudeHome"
+LOCAL_WORKSPACE_FOLDER="$workspace"
+LOCAL_WORKSPACE_FOLDER_BASENAME="$workspaceName"
+"@
+
+$envPath = Join-Path $PSScriptRoot '.env'
+Set-Content -Path $envPath -Value $envContent
+Write-Host "Wrote devcontainer .env to $envPath"

.devcontainer/setup-host.ps1

@@ -19,6 +19,9 @@ local.secrets.json
 # Claude Code local settings
 .claude/
 
+# Devcontainer generated env (created by setup-host.ps1)
+.devcontainer/.env
+
 # IDE specific
 .idea/
 *.suo

.gitignore

@@ -1,7 +1,5 @@
 {
     "recommendations": [
-        "ms-vscode.powershell",
-        "editorconfig.editorconfig",
-        "eamodio.gitlens"
+        "ms-vscode.powershell"
     ]
 }