Changeset 55353

Timestamp:

02/16/2023 03:48:26 AM (19 months ago)

Author:

helen

Message:

Build/Test Tools: Improve devcontainer setup for non-Codespaces usage

This now runs in local Docker as well. Sets the executable propset to explicitly identify install-tool.sh and setup.sh as executable. Unclear if this will sync via the Git mirror; ideally it would as otherwise the two files show as modified in a Git clone even in a fresh container.

Props samruddhikhandale.
See #57187.

Location:

trunk/.devcontainer

Files:

• devcontainer.json (modified) (1 diff)
• docker-compose.yml (modified) (3 diffs)
• install-tools.sh (modified) (1 diff, 1 prop)
• setup.sh (modified) (1 diff, 1 prop)

trunk/.devcontainer/devcontainer.json

@@ -3 +3 @@
     "name": "WordPress Core Development",
     "dockerComposeFile": "docker-compose.yml",
-    "service": "wordpress",
+    "service": "app",
     "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 

trunk/.devcontainer/docker-compose.yml

@@ -2 +2 @@
 
 services:
-  wordpress:
+  app:
     image: wordpress
     restart: always
@@ -13 +13 @@
       WORDPRESS_DB_NAME: exampledb
     volumes:
-      - ../src:/var/www/html
+      - ../..:/workspaces:cached
 
   db:
     image: mariadb
-    restart: always
+    restart: unless-stopped
     environment:
       MYSQL_DATABASE: exampledb
@@ -27 +27 @@
 
 volumes:
-  wordpress:
   db:

trunk/.devcontainer/install-tools.sh

@@ -8 +8 @@
 sudo mv wp-cli.phar /usr/local/bin/wp
 
+echo "Installing chromium..."
+sudo apt-get update
+sudo apt-get -y install --no-install-recommends chromium
+
 # Copy the welcome message
 sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt

trunk/.devcontainer/setup.sh

@@ -3 +3 @@
 set -eux
 
-if [ "${CODESPACE_NAME}" = "" ]; then
+if [ -z ${CODESPACE_NAME+x} ]; then
     SITE_HOST="http://localhost:8080"
 else