🐳 Publish Acorn dev container to GHCR and optimize setup (#477)

retlehs · claude · web-flow · commit 784fae3ba91a · 2025-08-06T22:12:58.000-04:00
* 🔥 Remove Minio, Selenium, Soketi, and Meilisearch services from devcontainer * 📝 Add dev container README * ♻️ Refactor devcontainer setup and add customization - Add customizable WordPress site title (defaults to "Acorn Testing") - Fix twentytwentyfour → twentytwentyfive theme removal - Use composer create-project for proper Sage theme installation - Add automatic bun build step after Sage installation - Fix chown permissions scope from /roots to /roots/app - Remove sudo from chmod commands in devcontainer.json - Add devcontainer CLI usage documentation to README - Document site title and repository customization options 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * 🔧 Use composer require instead of create-project for Sage 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * ♻️ Update routing tests to work with Sage theme - Refactor routing tests from mu-plugin approach to Sage theme integration - Add proper backup/restore of Sage functions.php with cleanup in tearDown - Add COMPOSER_ROOT_VERSION env var to handle version constraints cleanly - Update GitHub Actions to test with Sage theme activation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * ⚡ Skip Xdebug installation in CI environments - Detect CI environment and skip Xdebug install when CI=true - Improves CI build speed and test performance - Maintains full debugging capabilities for local development 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * 🐛 Fix devcontainer build timeout and remove legacy soil plugin - Remove Git feature that was causing build timeouts locally - Remove soil plugin activation (legacy code) - Export COMPOSER_ROOT_VERSION in setup script to ensure Sage v11 installation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * 🔧 Fix Sage v11 installation and remove duplicate Acorn - Remove existing Acorn before re-adding with version alias - Force Sage v11 installation by aliasing local Acorn as 5.0.x-dev - Remove Sage's vendored Acorn to use Bedrock's version - Add destroy.sh script for thorough cleanup * 🐛 Fix CI verification step after routing test refactor The /test/ route no longer exists since we moved from mu-plugin to Sage theme integration * 🔧 Remove unused COMPOSER_ROOT_VERSION environment variable No longer needed since we use dynamic version aliasing during setup * 🚀 Add dev container publishing workflow - Create devcontainer.yml workflow to publish image to GHCR - Update integration.yml to use published image cache - Publishes ghcr.io/roots/acorn-devcontainer:latest from main branch * 🔧 Enable dev container publishing on feature branch for testing - Add devcontainer-updates branch to publishing trigger - Tag images with branch name for testing - Update integration workflow to use branch-tagged cache * 🔥 Trigger dev container workflow * 🚀 Prepare dev container workflows for production - Remove branch-specific testing configuration - Publish workflow now only runs on main branch - Integration workflow uses :latest cache from GHCR - Clean up testing artifacts from Dockerfile --------- Co-authored-by: Claude <noreply@anthropic.com>
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -39,7 +39,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
       zip \
     # && pecl install imagick-3.7.0 && docker-php-ext-enable imagick \ # https://github.com/Imagick/imagick/issues/689
     && pecl install -o -f redis && docker-php-ext-enable redis \
-    && pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug \
+    && if [ -z "$CI" ]; then pecl install xdebug-3.4.0 && docker-php-ext-enable xdebug; fi \
     && apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # Install composer
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
@@ -0,0 +1,89 @@
+# Acorn Development Container
+
+This dev container provides a full WordPress development environment for working on Acorn, Acorn packages, and testing Sage themes.
+
+## Quick Start
+
+### VS Code (Recommended)
+1. Open in VS Code with Dev Containers extension
+2. Wait for container build and WordPress installation
+3. Access site at http://localhost:8080
+
+### Command Line
+```bash
+# Install devcontainer CLI
+npm install -g @devcontainers/cli
+
+# Start dev container
+devcontainer up --workspace-folder .
+
+# Execute commands in container
+devcontainer exec --workspace-folder . wp --info
+```
+
+## Services
+
+| Service | URL/Port | Purpose |
+|---------|----------|---------|
+| WordPress | http://localhost:8080 | Main application |
+| Mailpit | http://localhost:8025 | Email testing UI |
+| Database | localhost:3306 | MariaDB 10 |
+| Redis | localhost:6379 | Object caching |
+
+## Default Credentials
+
+- **WordPress Admin**: `admin` / `password`
+- **Database**: `database_name` / `database_user` / `database_password`
+
+## Common Commands
+
+```bash
+# WordPress CLI
+wp plugin list
+wp theme activate sage
+wp acorn optimize:clear
+
+# Composer (Acorn)
+cd /roots/acorn
+composer test
+
+# Build tools (themes)
+cd /roots/app/public/content/themes/sage
+bun install
+bun run build
+bun run dev
+```
+
+## Project Structure
+
+- `/roots/acorn` - Your local Acorn repository
+- `/roots/app` - WordPress installation (Bedrock)
+- `/roots/app/public/content/themes/` - WordPress themes
+- `/roots/app/public/content/plugins/` - WordPress plugins
+
+## Features
+
+- **PHP 8.4** with Xdebug configured
+- **Composer** and **WP-CLI** pre-installed
+- **Volta** for Node.js management
+- **Bun** for fast JavaScript builds
+- Auto-links themes/plugins based on `composer.json` type
+- Git dirty prompt indicator
+
+## Customization
+
+**WordPress Site Title**: Defaults to "Acorn Testing". Override with:
+```bash
+WP_SITE_TITLE="My Custom Site"
+```
+
+**WordPress Repository**: Clones Bedrock by default. To use a different setup:
+```bash
+REPOSITORY_URL=https://github.com/your/repo.git
+```
+
+## Troubleshooting
+
+- **Port conflicts**: Change ports in `.env` (e.g., `FORWARD_WEB_PORT=8081`)
+- **Rebuild container**: `Dev Containers: Rebuild Container` in VS Code
+- **Database issues**: Container includes automatic database reset on setup
diff --git a/.devcontainer/destroy.sh b/.devcontainer/destroy.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Kill and remove all devcontainer containers (more aggressive)
+echo "Force stopping all devcontainer containers..."
+docker ps -q | xargs -r docker kill 2>/dev/null || true
+
+echo "Removing all containers..."
+docker ps -aq | xargs -r docker rm -f 2>/dev/null || true
+
+# Remove all devcontainer volumes
+echo "Removing all devcontainer volumes..."
+docker volume ls -q | grep -E "acorn_devcontainer|devcontainer_acorn|devcontainer" | xargs -r docker volume rm -f 2>/dev/null || true
+
+# Clean up any dangling resources
+echo "Cleaning up dangling resources..."
+docker system prune -f --volumes 2>/dev/null || true
+
+# Wait a moment for ports to be released
+sleep 2
+
+# Check if anything is still running on port 8080
+if lsof -i :8080 >/dev/null 2>&1; then
+    echo "Warning: Something is still running on port 8080"
+    lsof -i :8080
+else
+    echo "Port 8080 is clear"
+fi
+
+echo "Devcontainer cleanup complete!"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -13,14 +13,11 @@
             "userGid": "1000",
             "upgradePackages": "true"
         },
-        "ghcr.io/devcontainers/features/sshd:1": {},
-        "ghcr.io/devcontainers/features/git:1": {
-            "version": "latest"
-        }
+        "ghcr.io/devcontainers/features/sshd:1": {}
     },
     "initializeCommand": "[ ! -f '.devcontainer/.env' ] && cp '.devcontainer/config/app/.env.example' '.devcontainer/.env' || true",
-    "onCreateCommand": "sudo chmod +x ./${localWorkspaceFolderBasename}/.devcontainer/install.sh && ./${localWorkspaceFolderBasename}/.devcontainer/install.sh",
-    "postCreateCommand": "sudo chmod +x ./${localWorkspaceFolderBasename}/.devcontainer/setup.sh && ./${localWorkspaceFolderBasename}/.devcontainer/setup.sh",
+    "onCreateCommand": "chmod +x ./${localWorkspaceFolderBasename}/.devcontainer/install.sh && ./${localWorkspaceFolderBasename}/.devcontainer/install.sh",
+    "postCreateCommand": "chmod +x ./${localWorkspaceFolderBasename}/.devcontainer/setup.sh && ./${localWorkspaceFolderBasename}/.devcontainer/setup.sh",
     "forwardPorts": [],
     "containerEnv": {
         "APP_SERVICE": "acorn.test",
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -77,36 +77,6 @@ services:
       retries: 3
       timeout: 5s
 
-  storage:
-    image: 'minio/minio:latest'
-    ports:
-      - '${FORWARD_MINIO_PORT:-9000}:9000'
-      - '${FORWARD_MINIO_CONSOLE_PORT:-8900}:8900'
-    environment:
-      MINIO_ACCESS_KEY: '${MINIO_ACCESS_KEY}'
-      MINIO_SECRET_KEY: '${MINIO_SECRET_KEY}'
-    volumes:
-      - 'storage:/data'
-    networks:
-      - acorn
-    healthcheck:
-      test:
-        [
-          'CMD',
-          'curl',
-          '-f',
-          'http://localhost:9000/minio/health/live'
-        ]
-      retries: 3
-      timeout: 5s
-
-  browser:
-    image: 'selenium/standalone-chrome'
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    networks:
-      - acorn
-
   mail:
     image: 'axllent/mailpit:latest'
     ports:
@@ -115,40 +85,6 @@ services:
     networks:
       - acorn
 
-  websocket:
-    image: 'quay.io/soketi/soketi:latest-16-alpine'
-    environment:
-      SOKETI_DEBUG: '${SOKETI_DEBUG:-1}'
-      SOKETI_METRICS_SERVER_PORT: '9601'
-      SOKETI_DEFAULT_APP_ID: '${PUSHER_APP_ID}'
-      SOKETI_DEFAULT_APP_KEY: '${PUSHER_APP_KEY}'
-      SOKETI_DEFAULT_APP_SECRET: '${PUSHER_APP_SECRET}'
-    ports:
-      - '${PUSHER_PORT:-6001}:6001'
-      - '${PUSHER_METRICS_PORT:-9601}:9601'
-    networks:
-      - acorn
-
-  search:
-    image: 'getmeili/meilisearch:latest'
-    ports:
-      - '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
-    volumes:
-      - 'search:/meili_data'
-    networks:
-      - acorn
-    healthcheck:
-      test:
-        [
-          'CMD',
-          'wget',
-          '--no-verbose',
-          '--spider',
-          'http://localhost:7700/health'
-        ]
-      retries: 3
-      timeout: 5s
-
 networks:
   acorn:
     driver: bridge
@@ -157,5 +93,3 @@ volumes:
   app:
   database:
   cache:
-  storage:
-  search:
diff --git a/.devcontainer/install.sh b/.devcontainer/install.sh
@@ -23,7 +23,7 @@ fi
 
 REPOSITORY_URL="${REPOSITORY_URL:-'https://github.com/roots/bedrock.git'}"
 
-sudo chown -R vscode:www-data /roots
+sudo chown -R vscode:www-data /roots/app
 cd /roots/app
 
 # if composer.json already exists, exit early
@@ -91,18 +91,18 @@ else
   && composer require -d /roots/app $(cat "${WORKSPACE_FOLDER}/composer.json" | jq '.name' | tr -d '"') --no-interaction -W --ignore-platform-reqs
 fi
 
-composer remove -d /roots/app wpackagist-theme/twentytwentyfour
+composer remove -d /roots/app wpackagist-theme/twentytwentyfive
 composer require -d /roots/app roots/acorn-prettify -W
 
 # Set filesystem permissions
-sudo chown -R vscode:www-data /roots/app
+sudo chown -R vscode:www-data /roots/app/public/content
 sudo find /roots/app/ -type d -exec chmod g+s {} \;
 sudo chmod g+w -R /roots/app
 
 cd /roots
 
 # wp-cli.yml file
-cat <<WPCLI > /roots/wp-cli.yml
+sudo tee /roots/wp-cli.yml > /dev/null <<WPCLI
 path: /roots/app/public/wp
 server:
   docroot: /roots/app/public
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -11,6 +11,9 @@ volta install bun
 
 WORKSPACE_FOLDER="${WORKSPACE_FOLDER:-"${PWD##*/}"}"
 
+# WordPress site title - defaults to "Acorn Testing", can be overridden
+WP_SITE_TITLE="${WP_SITE_TITLE:-"Acorn Testing"}"
+
 # source our application env vars to be used here
 . '/roots/app/.env';
 
@@ -31,12 +34,26 @@ if [ -f 'package.json' ]; then
 fi
 
 wp db reset --yes
-wp core install --url="${WP_HOME}" --title="Roots Test" --admin_user="admin" --admin_email="admin@roots.test" --admin_password="password1" --skip-email
+wp core install --url="${WP_HOME}" --title="${WP_SITE_TITLE}" --admin_user="admin" --admin_email="admin@roots.test" --admin_password="password" --skip-email
 
-# Add sage if there are no themes
-if [ ! "$(ls -d $(wp theme path --skip-plugins --skip-themes 2>/dev/null)/*/)" ]; then
-    composer require -d /roots/app roots/sage
+# Add sage if it's not active
+if ! wp theme status sage --skip-plugins --skip-themes 2>/dev/null | grep -q "^sage.*active"; then
+    # Only require sage if it doesn't exist
+    if ! wp theme is-installed sage --skip-plugins --skip-themes 2>/dev/null; then
+        # Remove existing Acorn to replace with version-aliased one
+        composer remove roots/acorn --no-update
+        # Add our local Acorn repository with version alias
+        composer config repositories.acorn '{"type": "path", "url": "/roots/acorn", "options": {"versions": {"roots/acorn": "5.0.x-dev"}}}'
+        # Install Sage v11 with our aliased Acorn
+        composer require "roots/sage:^11.0" "roots/acorn:5.0.x-dev" -W
+    fi
     wp theme activate sage
+    # Build the Sage theme
+    cd $(wp theme path --skip-plugins --skip-themes 2>/dev/null)/sage
+    # Remove Sage's vendored Acorn to use Bedrock's version
+    composer remove roots/acorn --no-update
+    composer update --no-install
+    bun install && bun run build
 fi
 
 install_theme() {
@@ -55,5 +72,4 @@ find $(wp theme path --skip-plugins --skip-themes 2>/dev/null) -mindepth 1 -maxd
     while read theme; do install_theme "$theme"; done
 
 wp dotenv salts regenerate --skip-plugins --skip-themes 2>/dev/null || true
-wp plugin activate soil --skip-plugins --skip-themes 2>/dev/null || true
 wp rewrite structure '%postname%' --hard --skip-plugins --skip-themes 2>/dev/null
diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
@@ -0,0 +1,32 @@
+name: Publish Dev Container
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - '.devcontainer/**'
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Build and push Dev Container
+        uses: devcontainers/ci@v0.3
+        with:
+          imageName: ghcr.io/roots/acorn-devcontainer
+          cacheFrom: ghcr.io/roots/acorn-devcontainer
+          push: always
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -16,25 +16,25 @@ jobs:
         uses: devcontainers/ci@v0.3
         with:
           configFile: .devcontainer/devcontainer.json
+          cacheFrom: ghcr.io/roots/acorn-devcontainer
+          push: never
           runCmd: |
-            cd /roots/app
-            composer install
-            # ???
-            composer remove roots/acorn
-            composer require roots/acorn --no-interaction
-            composer require --dev nunomaduro/collision
-            composer require --dev spatie/laravel-ignition
-            # ???
+            # Wait for database to be ready
             while ! mysqladmin ping -h"database" --silent; do
               sleep 1
             done
-            wp core install --url=http://web:8080 --title=Acorn --admin_user=admin --admin_password=admin --admin_email=admin@example.com --skip-email --allow-root
+            # Ensure WordPress is installed
+            cd /roots/app
+            wp core install --url=http://web:8080 --title="Acorn Testing" --admin_user=admin --admin_password=password --admin_email=admin@roots.test --skip-email --allow-root
+            # Ensure Sage theme is activated
+            wp theme activate sage
+            # Clear optimization cache
             wp acorn optimize:clear
-
+            # Run the routing integration tests
             cd /roots/acorn
             composer install
             composer run-script test tests/Integration/Routing
 
-      - name: Verify routes
+      - name: Verify site is running
         run: |
-          curl -s http://localhost:8080/test/ | grep "Howdy"
+          curl -I http://localhost:8080 | grep "200 OK"
diff --git a/tests/Integration/Routing/RoutingTest.php b/tests/Integration/Routing/RoutingTest.php
@@ -43,7 +43,7 @@
 
     $response = $client->request('GET', 'http://web:8080/non-existent-'.time());
     expect($response->getStatusCode())->toBe(404);
-    expect((string) $response->getBody())->toContain('Page not found');
+    expect((string) $response->getBody())->toContain('Not Found');
     expect((string) $response->getBody())->toHaveBodyClass('error404');
 });
 
diff --git a/tests/Integration/Routing/RoutingTestCase.php b/tests/Integration/Routing/RoutingTestCase.php
