From 9818f84ad92b9a4e480f6b0633f3d8a20bc641e7 Mon Sep 17 00:00:00 2001 From: Simon Hobbs Date: Tue, 30 Apr 2024 09:46:30 +1000 Subject: [PATCH 1/2] DDEV 1.23 compatiblity, Drupal core yarn/sqlite compatibility. Docs. --- README.md | 3 +-- config.ddev-drupal-core-dev.yaml | 10 ++++++++++ install.yaml | 4 ++-- .../{Dockerfile => Dockerfile.ddev-drupal-core-dev} | 10 ++-------- 4 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 config.ddev-drupal-core-dev.yaml rename web-build/{Dockerfile => Dockerfile.ddev-drupal-core-dev} (54%) 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/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml new file mode 100644 index 0000000..640dea4 --- /dev/null +++ b/config.ddev-drupal-core-dev.yaml @@ -0,0 +1,10 @@ +# #ddev-generated +# This file is placed by the justafish/ddev-drupal-core-dev addon. + +webimage_extra_packages: ["chromium-driver"] +ddev_version_constraint: '>=v1.23.0' +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/install.yaml b/install.yaml index 2c6b0dd..1e206a4 100644 --- a/install.yaml +++ b/install.yaml @@ -3,7 +3,8 @@ name: ddev-drupal-core-dev project_files: - - web-build/Dockerfile + - config.ddev-drupal-core-dev.yaml + - web-build/Dockerfile.ddev-drupal-core-dev - docker-compose.core-dev-selenium.yaml - core-dev/phpunit-firefox.xml - core-dev/phpunit-chrome.xml @@ -26,7 +27,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/web-build/Dockerfile b/web-build/Dockerfile.ddev-drupal-core-dev similarity index 54% rename from web-build/Dockerfile rename to web-build/Dockerfile.ddev-drupal-core-dev index ee3af69..804bd5b 100644 --- a/web-build/Dockerfile +++ b/web-build/Dockerfile.ddev-drupal-core-dev @@ -1,14 +1,8 @@ #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 + +# Drupal core needs later Sqlite than Debian 12 so install from Debian Trixie. 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 && \ From 57340e2c0ae4f4b59cbb566fbbcf231ae059ec91 Mon Sep 17 00:00:00 2001 From: Simon Hobbs Date: Tue, 30 Apr 2024 00:33:10 +1000 Subject: [PATCH 2/2] Need to use sqlite now b/c no mysql. From justafish/ddev-drupal-core-dev/pull/27/files. --- core-dev/phpunit-chrome.xml | 3 ++- core-dev/phpunit-firefox.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 @@ - + + - + +