#444 Add wunderio/ddev-drupal, update Adminer. Varnish, ES missing.

hkirsman · hkirsman · commit 69de0027286f · 2025-05-04T09:07:47.000+03:00
diff --git a/.ddev/addon-metadata/adminer/manifest.yaml b/.ddev/addon-metadata/adminer/manifest.yaml
@@ -1,7 +1,7 @@
 name: adminer
 repository: ddev/ddev-adminer
-version: v1.1.0
-install_date: "2025-03-12T09:43:10+02:00"
+version: v1.1.4
+install_date: "2025-05-04T08:53:02+03:00"
 project_files:
     - docker-compose.adminer.yaml
     - docker-compose.adminer_norouter.yaml
diff --git a/.ddev/commands/host/wunderio-core-syncdb.sh b/.ddev/commands/host/wunderio-core-syncdb.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+## Description: Synchronise local database with production.
+## Usage: syncdb
+## Example: "ddev syncdb"
+
+
+.ddev/wunderio/core/_run-scripts.sh tooling-syncdb.sh "$@"
diff --git a/.ddev/commands/web/wunderio-core-grumphp.sh b/.ddev/commands/web/wunderio-core-grumphp.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Runs GrumPHP commands.
+## Usage: grumphp
+## Example: "ddev grumphp"
+
+/var/www/html/.ddev/wunderio/core/_run-scripts.sh tooling-grumphp.sh "$@"
diff --git a/.ddev/commands/web/wunderio-core-phpunit.sh b/.ddev/commands/web/wunderio-core-phpunit.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Runs PHPUnit commands.
+## Usage: phpunit
+## Example: "ddev phpunit"
+
+/var/www/html/.ddev/wunderio/core/_run-scripts.sh tooling-phpunit.sh "$@"
diff --git a/.ddev/commands/web/wunderio-core-pmu.sh b/.ddev/commands/web/wunderio-core-pmu.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Runs drush pmu commands but also creates dummy module folder if it does not exist.
+## Usage: pmu
+## Example: "ddev pmu module1 module2 ..."
+
+/var/www/html/.ddev/wunderio/core/_run-scripts.sh tooling-pmu.sh "$@"
diff --git a/.ddev/commands/web/wunderio-core-regenerate-phpunit-config.sh b/.ddev/commands/web/wunderio-core-regenerate-phpunit-config.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Regenerates fresh PHPUnit configuration.
+## Usage: regenerate-phpunit-config
+## Example: "ddev regenerate-phpunit-config"
+
+/var/www/html/.ddev/wunderio/core/_run-scripts.sh tooling-regenerate-phpunit-config.sh
diff --git a/.ddev/commands/web/wunderio-core-yq.sh b/.ddev/commands/web/wunderio-core-yq.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+## Description: Runs yq commands (yq is a lightweight and portable command-line YAML processor).
+## Usage: yq
+## Example: "ddev yq"
+
+yq "$@"
diff --git a/.ddev/config.wunderio.yaml b/.ddev/config.wunderio.yaml
@@ -0,0 +1,29 @@
+hooks:
+  post-import-db:
+    - exec: "/var/www/html/.ddev/wunderio/core/_run-scripts.sh hooks-db-post-import.sh"
+  post-restore-snapshot:
+    - exec: "/var/www/html/.ddev/wunderio/core/_run-scripts.sh hooks-db-post-import.sh"
+  post-start:
+    # Build hook workaround to run composer install on first start.
+    # @todo We could potentially make this more like lando build hook by creating tmp files.
+    - exec: "[ ! -d \"/var/www/html/vendor\" ] && /var/www/html/.ddev/wunderio/core/_run-scripts.sh hooks-web-post-start-once.sh || true"
+    # Script to run on every start on the host.
+    - exec-host: ".ddev/wunderio/core/_run-scripts.sh hooks-host-post-start.sh"
+    # Script to run on every start.
+    - exec: "/var/www/html/.ddev/wunderio/core/_run-scripts.sh hooks-web-post-start.sh"
+    # Wunderio/ddev-drupal update check.
+    - exec: "UPDATE_SCRIPT=\"/var/www/html/vendor/wunderio/ddev-drupal/scripts/update_check.sh\"; [ -f \"$UPDATE_SCRIPT\" ] && $UPDATE_SCRIPT || true"
+web_environment:
+# Both this project and wunderio/lando-drupal use the same file
+# at drush/sites/local.site.yml. To make sure that the local alias
+# is working, we need to set the same environment variables here.
+- LANDO_WEBROOT=$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT
+# When Mutagen is enabled (which it is by default in DDEV v1.19+),
+# these directories are bind-mounted directly rather than synced via Mutagen
+# This improves performance for large file directories by bypassing Mutagen's
+# syncing.
+# The paths are relative to the project root.
+upload_dirs:
+  # Configure database_dumps directory to be bind-mounted directly
+  # instead of being synced via Mutagen for better performance
+  - ../database_dumps
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
@@ -21,25 +21,5 @@ web_environment:
   - DB_HOST=db
   - DRUSH_OPTIONS_URI=https://drupal-project.ddev.site
   - ENVIRONMENT_NAME=ddev
-  - EXEC_GRUMPHP_COMMAND=ddev php
   - HASH_SALT=notsosecurehash
-  - ELASTICSEARCH_HOST=elasticsearch
-  - VARNISH_ADMIN_HOST=varnish
-  - VARNISH_ADMIN_PORT=80
-  - SMTP_ADDRESS=localhost:1025
-
 corepack_enable: false
-hooks:
-  post-start:
-    - exec: "composer install"
-    - exec: "npm ci"
-    - exec-host: |
-        # Run the Elasticsearch plugin setup script
-        ddev exec -s elasticsearch /mnt/ddev_config/elasticsearch/elasticsearch-setup.sh
-
-        # Check for the restart marker file
-        if [ -f .ddev/elasticsearch/restart_needed ]; then
-          echo "Elasticsearch plugins installed. Restarting elasticsearch container..."
-          docker restart ddev-${DDEV_SITENAME}-elasticsearch
-          rm .ddev/elasticsearch/restart_needed
-        fi
diff --git a/.ddev/docker-compose.adminer.yaml b/.ddev/docker-compose.adminer.yaml
@@ -22,12 +22,14 @@ services:
       - "ddev-global-cache:/mnt/ddev-global-cache"
     depends_on:
       - db
+    command: ["php", "-S", "[::]:8080", "-t", "/var/www/html", "ddev-adminer.php"]
     configs:
-      - source: adminer-index.php
-        target: /var/www/html/index.php
+      - source: ddev-adminer.php
+        target: /var/www/html/ddev-adminer.php
+        mode: "0444"
 
 configs:
-  adminer-index.php:
+  ddev-adminer.php:
     content: |
       <?php
         if (!count($$_GET)) {
@@ -44,5 +46,5 @@ configs:
             'password' => $$_ENV['ADMINER_DEFAULT_PASSWORD'],
           ];
         }
-        include './adminer.php';
+        include './index.php';
       ?>
diff --git a/.ddev/docker-compose.adminer_norouter.yaml b/.ddev/docker-compose.adminer_norouter.yaml
@@ -1,4 +1,4 @@
 #ddev-generated
 # If omit_containers[ddev-router] then this file will be replaced
-# with another with a `ports` statement to directly expose port 8080 to 9100
+# with another with a 'ports' statement to directly expose port 8080 to 9100
 services: {}
diff --git a/.ddev/wunderio/core/__.env b/.ddev/wunderio/core/__.env
@@ -0,0 +1,8 @@
+# NOT USED, __ prefix means it's under evaluation if to be removed.
+# Inject additional environment variables into every Lando service
+# @see: https://docs.lando.dev/config/env.html#environment-files
+DB_NAME_DRUPAL=drupal10
+DB_USER_DRUPAL=drupal10
+DB_PASS_DRUPAL=drupal10
+DB_HOST_DRUPAL=database
+DRUSH_OPTIONS_URI=https://drupal-project.lndo.site
diff --git a/.ddev/wunderio/core/__varnish.vcl b/.ddev/wunderio/core/__varnish.vcl
@@ -0,0 +1,15 @@
+# NOT USED, __ prefix means it's under evaluation if to be removed.
+# @see: https://github.com/wunderio/charts/blob/master/drupal/templates/varnish-configmap-vcl.yaml
+# The routine when we deliver the HTTP request to the user
+# Last chance to modify headers that are sent to the client
+sub vcl_deliver {
+  # Called before a cached object is delivered to the client.
+
+  # Add debug header to see if it's a HIT/MISS and the number of hits, disable when not needed.
+  if (obj.hits > 0) {
+    set resp.http.X-W-Cache = "HIT";
+    set resp.http.X-W-Cache-Hits = obj.hits;
+  } else {
+    set resp.http.X-W-Cache = "MISS";
+  }
+}
diff --git a/.ddev/wunderio/core/_helpers.sh b/.ddev/wunderio/core/_helpers.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+#
+# Helper functions.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+# Function to display status message
+display_status_message() {
+    local color_green="\033[38;5;70m"
+    local color_reset="\033[0m"
+    local message="$1"
+
+    printf "${color_green}${message}${color_reset}\n"
+}
diff --git a/.ddev/wunderio/core/_run-scripts.sh b/.ddev/wunderio/core/_run-scripts.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#
+# Helper script to run other scripts and allow overriding them by having the
+# same file in .ddev/wunderio/custom folder.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+script_name="$1"
+# Remove the first argument (the script name) to get the remaining arguments
+shift 1
+
+custom_script=".ddev/wunderio/custom/$script_name"
+core_script=".ddev/wunderio/core/$script_name"
+
+# Check if the custom script exists and is executable
+if [ -x "$custom_script" ]; then
+    echo "Running custom script: $custom_script"
+    # Run the script and pass all remaining arguments.
+    "$custom_script" "$@"
+elif [ -x "$core_script" ]; then
+    # If the custom script doesn't exist, run the core script.
+    echo "Running core script: $core_script"
+    # Run the script and pass all remaining arguments.
+    "$core_script" "$@"
+else
+    echo "Script not found or not executable: $script_name"
+    exit 1
+fi
diff --git a/.ddev/wunderio/core/hooks-db-post-import.sh b/.ddev/wunderio/core/hooks-db-post-import.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#
+# Helper script to run posb-import db hook.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+source /var/www/html/.ddev/wunderio/core/_helpers.sh
+
+cd $DDEV_COMPOSER_ROOT && drush cache:rebuild -y && drush sqlsan -y
+
+uli_link=$(drush uli)
+display_status_message "Drupal is working, running drush uli: $uli_link"
diff --git a/.ddev/wunderio/core/hooks-host-post-start.sh b/.ddev/wunderio/core/hooks-host-post-start.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+#
+# Helper script to run host post-start commands.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
diff --git a/.ddev/wunderio/core/hooks-web-post-start-once.sh b/.ddev/wunderio/core/hooks-web-post-start-once.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#
+# Helper script to run web commands on first post start.
+#
+# This is run only if there's no vendor folder. There's no 'build'
+# command as we have in Lando so we have this instead.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+composer install
diff --git a/.ddev/wunderio/core/hooks-web-post-start.sh b/.ddev/wunderio/core/hooks-web-post-start.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#
+# Helper script to run web post-start commands.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+source .ddev/wunderio/core/_helpers.sh
+
+# Function to check if Drupal is working.
+is_drupal_working() {
+    # Drush 11 and older.
+    status=$(drush status bootstrap 2>&1)
+    if echo "$status" | grep -q "Successful"; then
+        # "Successful" found, Drupal is working.
+        return 0
+    fi
+
+    # Drush 12 and newer.
+    status=$(drush status --field=bootstrap 2>&1)
+    if echo "$status" | grep -q "Successful"; then
+        # "Successful" found, Drupal is working.
+        return 0
+    fi
+
+    return 1
+}
+
+# Commands to run if Drupal is working.
+if is_drupal_working; then
+    uli_link=$(drush uli)
+    display_status_message "Drupal is working, running drush uli: $uli_link"
+fi
diff --git a/.ddev/wunderio/core/tooling-grumphp.sh b/.ddev/wunderio/core/tooling-grumphp.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+#
+# Helper script to run GrumPHP.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+php /var/www/html/vendor/bin/grumphp "$@"
diff --git a/.ddev/wunderio/core/tooling-phpunit.sh b/.ddev/wunderio/core/tooling-phpunit.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#
+# Helper script to run PHPUnit.
+#
+
+set -eu
+if [[ -n "${WUNDERIO_DEBUG:-}" ]]; then
+    set -x
+fi
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/var/www/html/vendor/bin
+
+if [ ! -f "/var/www/html/phpunit.xml" ]; then
+    echo "phpunit.xml not found! Please run 'ddev regenerate-phpunit-config'."
+    exit 1
+fi
+
+php /var/www/html/vendor/bin/phpunit -c /var/www/html/phpunit.xml --testdox "$@"
diff --git a/.ddev/wunderio/core/tooling-pmu.sh b/.ddev/wunderio/core/tooling-pmu.sh
diff --git a/.ddev/wunderio/core/tooling-regenerate-phpunit-config.sh b/.ddev/wunderio/core/tooling-regenerate-phpunit-config.sh
diff --git a/.ddev/wunderio/core/tooling-syncdb.sh b/.ddev/wunderio/core/tooling-syncdb.sh
diff --git a/.ddev/wunderio/custom/.gitignore b/.ddev/wunderio/custom/.gitignore
diff --git a/composer.json b/composer.json
diff --git a/drush/sites/local.site.yml b/drush/sites/local.site.yml
