From cd06f6cea7781286c769dc4129ed672bb29c316f Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Thu, 23 May 2024 08:54:28 -0600
Subject: [PATCH] Final config for use with DDEV v1.23.1, replaces #30,
 replaces #23 (#31)

* DDEV 1.23 compatiblity, Drupal core yarn/sqlite compatibility. Docs.

* Need to use sqlite now b/c no mysql. From justafish/ddev-drupal-core-dev/pull/27/files.

* Remove install of sqlite3 and make dependent on DDEV v1.23.1

* Run tests now that sqlite 3.45 in DDEV release

* Dockerfile is gone, don't try to install it

* add back in omit_containers, can remove farther down the line

* Remove --verbose from phpunit command, not supported in phpunit 10

---------

Co-authored-by: Simon Hobbs <simon@hobbs.id.au>
---
 README.md                        |  3 +--
 commands/web/phpunit             |  2 +-
 config.ddev-drupal-core-dev.yaml | 11 +++++++++++
 core-dev/phpunit-chrome.xml      |  3 ++-
 core-dev/phpunit-firefox.xml     |  3 ++-
 install.yaml                     |  3 +--
 tests/test.bats                  |  2 +-
 web-build/Dockerfile             | 17 -----------------
 8 files changed, 19 insertions(+), 25 deletions(-)
 create mode 100644 config.ddev-drupal-core-dev.yaml
 delete mode 100644 web-build/Dockerfile

diff --git a/README.md b/README.md
index 18e37d5..2721e7e 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,8 @@ We're in #ddev-for-core-dev on [Drupal Slack](https://www.drupal.org/community/c
 ```
 git clone https://git.drupalcode.org/project/drupal.git drupal
 cd drupal
-ddev config --project-type=drupal10
+ddev config --omit-containers=db --disable-settings-management
 ddev start
-ddev corepack enable
 ddev get justafish/ddev-drupal-core-dev
 ddev restart
 ddev composer install
diff --git a/commands/web/phpunit b/commands/web/phpunit
index 2e6a77c..0e83730 100644
--- a/commands/web/phpunit
+++ b/commands/web/phpunit
@@ -11,4 +11,4 @@ if ! command -v phpunit >/dev/null; then
 fi
 echo "Clearing old webdriver sessions"
 curl -f -s http://chrome:4444/status | jq -r '.value.nodes[].slots[].session.sessionId' | while read -r session; do if [ "$session" != "null" ]; then curl -X DELETE "http://chrome:4444/session/$session"; fi; done
-phpunit -c core --verbose "$@"
+phpunit -c core "$@"
diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
new file mode 100644
index 0000000..ee664a2
--- /dev/null
+++ b/config.ddev-drupal-core-dev.yaml
@@ -0,0 +1,11 @@
+# #ddev-generated
+# This file is placed by the justafish/ddev-drupal-core-dev addon.
+
+webimage_extra_packages: ["chromium-driver"]
+ddev_version_constraint: '>=v1.23.1'
+omit_containers: ["db"]
+upload_dirs:
+# The install technique tries to remove all of sites/default/files
+# but with DDEV + mutagen that isn't possible.
+# so just redirect the upload_dirs.
+    - .ddev/tmp
diff --git a/core-dev/phpunit-chrome.xml b/core-dev/phpunit-chrome.xml
index fc02f8e..a4888bd 100644
--- a/core-dev/phpunit-chrome.xml
+++ b/core-dev/phpunit-chrome.xml
@@ -23,7 +23,8 @@
         <!-- Do not limit the amount of memory tests take to run. -->
         <ini name="memory_limit" value="-1"/>
         <env name="SIMPLETEST_BASE_URL" value="DRUPAL_CORE_DDEV_URL"/>
-        <env name="SIMPLETEST_DB" value="mysql://db:db@db/db"/>
+        <!-- <env name="SIMPLETEST_DB" value="mysql://db:db@db/db"/> -->
+        <env name="SIMPLETEST_DB" value="sqlite://localhost/sites/default/files/db.sqlite"/>        
         <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="/var/www/html/test_output"/>
         <!-- By default, browser tests will output links that use the base URL set
          in SIMPLETEST_BASE_URL. However, if your SIMPLETEST_BASE_URL is an internal
diff --git a/core-dev/phpunit-firefox.xml b/core-dev/phpunit-firefox.xml
index a413a15..564f83c 100644
--- a/core-dev/phpunit-firefox.xml
+++ b/core-dev/phpunit-firefox.xml
@@ -23,7 +23,8 @@
         <!-- Do not limit the amount of memory tests take to run. -->
         <ini name="memory_limit" value="-1"/>
         <env name="SIMPLETEST_BASE_URL" value="DRUPAL_CORE_DDEV_URL"/>
-        <env name="SIMPLETEST_DB" value="mysql://db:db@db/db"/>
+        <!-- <env name="SIMPLETEST_DB" value="mysql://db:db@db/db"/> -->
+        <env name="SIMPLETEST_DB" value="sqlite://localhost/sites/default/files/db.sqlite"/>
         <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="/var/www/html/test_output"/>
         <!-- By default, browser tests will output links that use the base URL set
          in SIMPLETEST_BASE_URL. However, if your SIMPLETEST_BASE_URL is an internal
diff --git a/install.yaml b/install.yaml
index 2c6b0dd..35cf024 100644
--- a/install.yaml
+++ b/install.yaml
@@ -3,7 +3,7 @@
 name: ddev-drupal-core-dev
 
 project_files:
-  - web-build/Dockerfile
+  - config.ddev-drupal-core-dev.yaml
   - docker-compose.core-dev-selenium.yaml
   - core-dev/phpunit-firefox.xml
   - core-dev/phpunit-chrome.xml
@@ -26,7 +26,6 @@ post_install_actions:
   - cp core-dev/gitignore ../.gitignore
   - mkdir -p ../test_output
   - chmod +w ../test_output
-  - ddev exec corepack enable
   - cd ../core && ddev yarn
 
 removal_actions:
diff --git a/tests/test.bats b/tests/test.bats
index 06d76e8..09b4304 100644
--- a/tests/test.bats
+++ b/tests/test.bats
@@ -1,7 +1,7 @@
 setup() {
   set -eu -o pipefail
   export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
-  export TESTDIR=~/tmp/ddev-drupal-core-dev
+  export TESTDIR=~/tmp/test-ddev-drupal-core-dev
   mkdir -p $TESTDIR
   export PROJNAME=ddev-drupal-core-dev
   export DDEV_NON_INTERACTIVE=true
diff --git a/web-build/Dockerfile b/web-build/Dockerfile
deleted file mode 100644
index ee3af69..0000000
--- a/web-build/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-#ddev-generated
-# Note that the chromium-driver install could be moved to webimage_extra_packages
-RUN sudo apt-get update && sudo apt-get install chromium-driver -y
-# This will not be necessary in DDEV v1.23+
-RUN corepack enable
-
-# TODO:
-# This section is temporary and needs to be removed when
-# https://github.com/justafish/ddev-drupal-core-dev/pull/23/files#top
-# is pulled, because it includes this update.
-ARG TARGETPLATFORM
-RUN SQLITE_VERSION=3.45.1 && \
-    mkdir -p /tmp/sqlite3 && \
-    wget -O /tmp/sqlite3/sqlite3.deb https://ftp.debian.org/debian/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \
-    wget -O /tmp/sqlite3/libsqlite3.deb https://ftp.debian.org/debian/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETPLATFORM##linux/}.deb && \
-    dpkg -i /tmp/sqlite3/*.deb && \
-    rm -rf /tmp/sqlite3