From a91bd46c031a4d61cbcf33255bcaeafb8e49d97c Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 17:36:43 -0700
Subject: [PATCH 01/12] chore: update config

---
 .env.example |  6 +++---
 .lando.yml   |  8 ++++----
 README.md    | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.env.example b/.env.example
index 1d4bd75..bddd7b3 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,6 @@
-DB_NAME=wordpress
-DB_USER=wordpress
-DB_PASSWORD=wordpress
+DB_NAME=pressbooks_oss
+DB_USER=pressbooks_oss_user
+DB_PASSWORD=secretpassword
 DB_HOST=database
 WP_HOME=https://pressbooks.test
 WP_SITEURL=${WP_HOME}/wp
diff --git a/.lando.yml b/.lando.yml
index f6a4f35..302a146 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -1,4 +1,4 @@
-name: pressbooks-local
+name: oss-pb-local
 recipe: wordpress
 config:
   webroot: web
@@ -16,10 +16,10 @@ env_file:
 services:
   database:
     type: mariadb:10.5.23
-    portforward: 32777
+    portforward: 32778
   redis:
     type: redis:5.0
-    portforward: 6379
+    portforward: 6380
   node:
     type: node
   appserver:
@@ -38,7 +38,7 @@ services:
     type: mailhog
     overrides:
       image: anatomicjc/mailhog:1.0.1
-    portforward: 8025
+    portforward: 8026
 tooling:
   php:
     service: appserver
diff --git a/README.md b/README.md
index e6e523d..bc72c28 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Setup Development Environment
-This repository uses Lando/Docker to provision a local instance of Pressbooks for testing and development by open source contributors. It uses the public `pressbooks/bedrock` repo and has been tested with GNU/Linux and MacOS.
+This repository uses Lando/Docker to provision a local instance of Pressbooks for testing and development by open source contributors. It has been tested with GNU/Linux, MacOS, and Windows.
 
 *NOTE: This repo is intended to help developers quickly provision a Pressbooks instance locally. It should not be deployed to production environments, as it lacks several features that are useful for hosted environments (like a persistent object cache backend).* 
 
@@ -66,15 +66,15 @@ You can run tests inside your Lando instance with the following commands:
 
 `lando testbygroup <GROUPNAME>` Run only a specific group of tests, for example: `lando testbygroup covergenerator`.
 
-### XDebug configuration in PHPSTORM
+### XDebug configuration
 You can configure XDebug locally by adding a new PHP Remote Debug configuration and setting the following values:
 - Name: appserver
 - Host: pressbooks.test
 - Port: 443
 - Use path mappings: <YOUR PATH>/app/web -> /app/web
 
-### Add DB Connection in PHPSTORM
-You can set up access to your database in PHPStorm by creating a new MariaDB connection and setting the following values:
+### Add DB Connection
+You can set up access to your database in your IDE by creating a new MariaDB connection and setting the following values:
 1. Run `lando info` and note the `host` and `port` values used by your `database` service.
 2. In PHPStorm, open the `Database` menu (on the right side of the IDE), click the `+` button and add a new `MariaDB` connection. 
 3. Enter the following connection data:
@@ -90,4 +90,4 @@ You can set up access to your database in PHPStorm by creating a new MariaDB con
 - You can install or update dependencies in the container or any repo by navigating to the desired location and running `lando composer install` or `lando composer update`.
 - For SSH access to the appserver you can run: `lando ssh` or `lando ssh -u root` (if you wish to access the appserver as the root user)
 - You can shut down the container by running `lando stop`.
-- Logs can be read with `lando logs`.
+- Logs can be read with `lando logs`.
\ No newline at end of file

From 7f06c15ae61e069bdd9e5c4b915dc9e80576cfd2 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 20:54:00 -0700
Subject: [PATCH 02/12] chore: update composer.json

---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 89c01a7..5d5d57e 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "composer/installers": "^2.2",
         "owlsdepartment/multisite-url-fixer": "dev-main",
         "pressbooks/pressbooks": "dev-dev",
@@ -55,9 +55,8 @@
         "pressbooks/pressbooks-saml-sso": "dev-dev",
         "roots/bedrock-autoloader": "^1.0",
         "roots/bedrock-disallow-indexing": "^2.0",
-        "roots/wordpress": "^6.4",
+        "roots/wordpress": "^6.8",
         "roots/wp-config": "1.0.0",
-        "roots/wp-password-bcrypt": "1.1.0",
         "vlucas/phpdotenv": "^5.6"
     },
     "require-dev": {

From 994c1501b71fc3eafafaa678a205cff809a97842 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 21:00:08 -0700
Subject: [PATCH 03/12] chore: add db creds to lando recipe

---
 .lando.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.lando.yml b/.lando.yml
index 302a146..2cdd191 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -17,6 +17,10 @@ services:
   database:
     type: mariadb:10.5.23
     portforward: 32778
+    creds:
+      user: pressbooks_oss_user
+      password: secretpassword
+      database: pressbooks_oss
   redis:
     type: redis:5.0
     portforward: 6380

From 8f743624ca1e845a8d797d60790904949b3e8625 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 21:29:52 -0700
Subject: [PATCH 04/12] chore: add custom db import script

---
 .lando.yml           |  5 +++++
 scripts/import_db.sh | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 scripts/import_db.sh

diff --git a/.lando.yml b/.lando.yml
index 2cdd191..18e3ac2 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -72,3 +72,8 @@ tooling:
     description: Run tests by filter
     cmd:
       - appserver: composer run filter_test
+  db-import-custom:
+    description: Import a SQL dump into the database defined in .env
+    cmd: 
+      - appserver: scripts/import_db.sh
+    user: root
\ No newline at end of file
diff --git a/scripts/import_db.sh b/scripts/import_db.sh
new file mode 100755
index 0000000..02b64a6
--- /dev/null
+++ b/scripts/import_db.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Usage: ./import_db.sh pb_local_db.sql
+
+SQL_FILE="$1"
+
+if [ -z "$SQL_FILE" ]; then
+  echo "Usage: $0 <file.sql>"
+  exit 1
+fi
+
+# Load environment variables from .env
+set -a
+source .env
+set +a
+
+# Import SQL using TCP host
+mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" < "$SQL_FILE"

From 56cc29bef758a75cac8e6c2e7b3edc805ad650b4 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 21:31:05 -0700
Subject: [PATCH 05/12] chore: update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc72c28..2cc9b02 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ This repository uses Lando/Docker to provision a local instance of Pressbooks fo
  	 Press `Enter` to accept the default directory.
 8. Import the prepared sample database included in this repo:
    ```bash
-   lando db-import pb_local_db.sql
+   lando db-import-custom pb_local_db.sql
    ```
 9. Install Pressbooks testing utilities
 	 ```bash

From 2ac1e42c984419c5b0bcab1eb6cee21b731cc77f Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 21:45:52 -0700
Subject: [PATCH 06/12] chore: simplify  install steps

---
 .lando.yml           |  2 ++
 README.md            | 18 +++++-------------
 scripts/import_db.sh | 22 +++++++++++++++++++---
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.lando.yml b/.lando.yml
index 18e3ac2..d9deab9 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -34,6 +34,8 @@ services:
       XDEBUG_SESSION_START: lando
     build_as_root:
       - scripts/pressbooks_required_libraries.sh
+      - bash /app/scripts/import_db.sh /app/pb_local_db.sql
+      - bash /app/scripts/prepare_tests_environment.sh
     build:
       - composer install
   mailhog:
diff --git a/README.md b/README.md
index 2cc9b02..36b5f8e 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ This repository uses Lando/Docker to provision a local instance of Pressbooks fo
    ```bash
    lando start
    ```
-   During the build process, you may be asked for an installation folder for Prince:
+   This will create all the services needed to install a local instance of Pressbooks and import a sample database. During the build process, you may be asked for an installation folder for Prince:
 	 ```bash
    Install directory
    This is the directory in which Prince 20220930 will be installed.
@@ -45,15 +45,7 @@ This repository uses Lando/Docker to provision a local instance of Pressbooks fo
    [/usr]: 
 	 ```
  	 Press `Enter` to accept the default directory.
-8. Import the prepared sample database included in this repo:
-   ```bash
-   lando db-import-custom pb_local_db.sql
-   ```
-9. Install Pressbooks testing utilities
-	 ```bash
-   lando install-tests
-   ```
-10. [Optional] Tell your host machine to trust the default Lando Certificate Authority by following these instructions: https://docs.lando.dev/core/v3/security.html#trusting-the-ca   
+8. [Optional] Tell your host machine to trust the default Lando Certificate Authority by following these instructions: https://docs.lando.dev/core/v3/security.html#trusting-the-ca   
 
 ### Web access
 Once you have completed these steps, you should be able to use Pressbooks locally by visiting `http://pressbooks.test` or `https://pressbooks.test`.
@@ -79,9 +71,9 @@ You can set up access to your database in your IDE by creating a new MariaDB con
 2. In PHPStorm, open the `Database` menu (on the right side of the IDE), click the `+` button and add a new `MariaDB` connection. 
 3. Enter the following connection data:
     - The `host` and `port` values obtained by running `lando info` earlier
-    - user: wordpress
-    - password: wordpress
-    - database: wordpress
+    - user: pressbooks_oss_user
+    - password: secretpassword
+    - database: pressbooks_oss
 
 ### Notes
 - The sample database includes a single empty public book and a single super admin user with a username / password of `admin / admin`.
diff --git a/scripts/import_db.sh b/scripts/import_db.sh
index 02b64a6..ce1f61e 100755
--- a/scripts/import_db.sh
+++ b/scripts/import_db.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Usage: ./import_db.sh pb_local_db.sql
+# Safe automatic DB import for Lando
+# Usage: ./import_db.sh /app/pb_local_db.sql
 
 SQL_FILE="$1"
 
@@ -10,8 +11,23 @@ fi
 
 # Load environment variables from .env
 set -a
-source .env
+source /app/.env
 set +a
 
-# Import SQL using TCP host
+# Check if database exists
+DB_EXISTS=$(mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "SHOW DATABASES LIKE '$DB_NAME';" | grep "$DB_NAME")
+
+if [ -n "$DB_EXISTS" ]; then
+  echo "Database '$DB_NAME' exists. Skipping import."
+  exit 0
+fi
+
+echo "Database '$DB_NAME' does not exist. Creating and importing..."
+
+# Create database if missing
+mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "CREATE DATABASE IF NOT EXISTS $DB_NAME;"
+
+# Import SQL
 mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" < "$SQL_FILE"
+
+echo "Import complete!"
\ No newline at end of file

From 4ba9eac641ba6afa9bcefdb93bb98b12a58e21de Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 21:58:22 -0700
Subject: [PATCH 07/12] fix: imporve scripts and run order

---
 .lando.yml           | 13 ++++++------
 scripts/import_db.sh | 48 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/.lando.yml b/.lando.yml
index d9deab9..c7675b4 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -34,8 +34,6 @@ services:
       XDEBUG_SESSION_START: lando
     build_as_root:
       - scripts/pressbooks_required_libraries.sh
-      - bash /app/scripts/import_db.sh /app/pb_local_db.sql
-      - bash /app/scripts/prepare_tests_environment.sh
     build:
       - composer install
   mailhog:
@@ -45,6 +43,11 @@ services:
     overrides:
       image: anatomicjc/mailhog:1.0.1
     portforward: 8026
+events:
+  post-start:
+    - appserver:
+        - bash /app/scripts/import_db.sh /app/pb_local_db.sql
+        - bash /app/scripts/prepare_tests_environment.sh
 tooling:
   php:
     service: appserver
@@ -56,8 +59,7 @@ tooling:
     service: node
   install-tests:
     description: Install test requirements
-    cmd:
-      - appserver: scripts/prepare_tests_environment.sh
+    cmd: scripts/prepare_tests_environment.sh
   test:
     description: Run all Unit Tests
     cmd:
@@ -76,6 +78,5 @@ tooling:
       - appserver: composer run filter_test
   db-import-custom:
     description: Import a SQL dump into the database defined in .env
-    cmd: 
-      - appserver: scripts/import_db.sh
+    cmd: scripts/import_db.sh
     user: root
\ No newline at end of file
diff --git a/scripts/import_db.sh b/scripts/import_db.sh
index ce1f61e..803cc89 100755
--- a/scripts/import_db.sh
+++ b/scripts/import_db.sh
@@ -1,11 +1,28 @@
 #!/bin/bash
-# Safe automatic DB import for Lando
-# Usage: ./import_db.sh /app/pb_local_db.sql
-
-SQL_FILE="$1"
+# Safe automatic DB import for Lando with optional force import
+# Usage:
+#   ./import_db.sh /app/pb_local_db.sql       # safe import, skips if DB exists
+#   ./import_db.sh --force /app/pb_local_db.sql  # force re-import
+
+FORCE=false
+SQL_FILE=""
+
+# Parse arguments
+for arg in "$@"; do
+  case $arg in
+    --force|-f)
+      FORCE=true
+      shift
+      ;;
+    *)
+      SQL_FILE="$arg"
+      shift
+      ;;
+  esac
+done
 
 if [ -z "$SQL_FILE" ]; then
-  echo "Usage: $0 <file.sql>"
+  echo "Usage: $0 [--force|-f] <file.sql>"
   exit 1
 fi
 
@@ -14,17 +31,24 @@ set -a
 source /app/.env
 set +a
 
-# Check if database exists
-DB_EXISTS=$(mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "SHOW DATABASES LIKE '$DB_NAME';" | grep "$DB_NAME")
+if [ "$FORCE" = false ]; then
+  # Check if database exists
+  DB_EXISTS=$(mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "SHOW DATABASES LIKE '$DB_NAME';" | grep "$DB_NAME")
 
-if [ -n "$DB_EXISTS" ]; then
-  echo "Database '$DB_NAME' exists. Skipping import."
-  exit 0
+  if [ -n "$DB_EXISTS" ]; then
+    echo "Database '$DB_NAME' exists. Skipping import."
+    exit 0
+  fi
 fi
 
-echo "Database '$DB_NAME' does not exist. Creating and importing..."
+echo "Database '$DB_NAME' will be created/imported..."
+
+# Drop and recreate DB if force is true
+if [ "$FORCE" = true ]; then
+  mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "DROP DATABASE IF EXISTS $DB_NAME;"
+fi
 
-# Create database if missing
+# Ensure database exists
 mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "CREATE DATABASE IF NOT EXISTS $DB_NAME;"
 
 # Import SQL

From 911fc9e9756859f15697b10ce3577e2baa678b51 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 22:19:15 -0700
Subject: [PATCH 08/12] chore: improve readme ^ build steps

---
 .lando.yml | 13 ++++++-------
 README.md  |  3 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.lando.yml b/.lando.yml
index c7675b4..04d3fcd 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -36,18 +36,16 @@ services:
       - scripts/pressbooks_required_libraries.sh
     build:
       - composer install
+    run_as_root: 
+      - bash /app/scripts/import_db.sh /app/pb_local_db.sql
+      - bash /app/scripts/prepare_tests_environment.sh
   mailhog:
     hogfrom:
       - appserver
     type: mailhog
     overrides:
       image: anatomicjc/mailhog:1.0.1
-    portforward: 8026
-events:
-  post-start:
-    - appserver:
-        - bash /app/scripts/import_db.sh /app/pb_local_db.sql
-        - bash /app/scripts/prepare_tests_environment.sh
+    portforward: 8026        
 tooling:
   php:
     service: appserver
@@ -78,5 +76,6 @@ tooling:
       - appserver: composer run filter_test
   db-import-custom:
     description: Import a SQL dump into the database defined in .env
-    cmd: scripts/import_db.sh
+    cmd: 
+      - appserver: scripts/import_db.sh
     user: root
\ No newline at end of file
diff --git a/README.md b/README.md
index 36b5f8e..88db020 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ This repository uses Lando/Docker to provision a local instance of Pressbooks fo
 Once you have completed these steps, you should be able to use Pressbooks locally by visiting `http://pressbooks.test` or `https://pressbooks.test`.
 
 ### Running tests
+Everything needed to run unit tests will be provided when you run `lando start`. You can re-install the Pressbooks test suite by running `lando install-tests`. 
+
 You can run tests inside your Lando instance with the following commands:
 `lando test` (this is a shortcut which runs the core Pressbooks unit tests inside your container)
 
@@ -78,6 +80,7 @@ You can set up access to your database in your IDE by creating a new MariaDB con
 ### Notes
 - The sample database includes a single empty public book and a single super admin user with a username / password of `admin / admin`.
 - The `.env.example` file provides some additional environment variables which can be used with your local Pressbooks installation but are commented out by default. If you wish to install the optional PB MathJax service, you can do so following the instructions here: https://github.com/pressbooks/pb-mathjax?tab=readme-ov-file#installation. Once you've launched the service, you can uncomment the relevant line in your local `.env` file. Similar sample `.env` variables are provided for optional DocRaptor, Sentry, Redis, and Algolia integrations.
+- You can force a reimport of the sample DB by running `lando db-import-custom pb_local_db.sql --force`
 - `lando info` provides a list of all the services and their ports.
 - You can install or update dependencies in the container or any repo by navigating to the desired location and running `lando composer install` or `lando composer update`.
 - For SSH access to the appserver you can run: `lando ssh` or `lando ssh -u root` (if you wish to access the appserver as the root user)

From 7e4b8904154f58d135fd7985c95a15e258fd6796 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 22:24:29 -0700
Subject: [PATCH 09/12] chore: clean up test installation

---
 .lando.yml                                                     | 3 ++-
 ...repare_tests_environment.sh => prepare_test_environment.sh} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename scripts/{prepare_tests_environment.sh => prepare_test_environment.sh} (100%)

diff --git a/.lando.yml b/.lando.yml
index 04d3fcd..c78d5b6 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -57,7 +57,8 @@ tooling:
     service: node
   install-tests:
     description: Install test requirements
-    cmd: scripts/prepare_tests_environment.sh
+    cmd: 
+      - appserver: scripts/prepare_test_environment.sh
   test:
     description: Run all Unit Tests
     cmd:
diff --git a/scripts/prepare_tests_environment.sh b/scripts/prepare_test_environment.sh
similarity index 100%
rename from scripts/prepare_tests_environment.sh
rename to scripts/prepare_test_environment.sh

From 7b15faf39c2ee83c5af6059d95cd7b1facdda270 Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Thu, 25 Sep 2025 22:24:59 -0700
Subject: [PATCH 10/12] chore: fix typo

---
 .lando.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.lando.yml b/.lando.yml
index c78d5b6..902002f 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -38,7 +38,7 @@ services:
       - composer install
     run_as_root: 
       - bash /app/scripts/import_db.sh /app/pb_local_db.sql
-      - bash /app/scripts/prepare_tests_environment.sh
+      - bash /app/scripts/prepare_test_environment.sh
   mailhog:
     hogfrom:
       - appserver

From 1f933f7633b17f8e54d8366d25dd40e7567249ba Mon Sep 17 00:00:00 2001
From: Oscar Arzola <oscararzola@gmail.com>
Date: Fri, 26 Sep 2025 13:35:58 -0400
Subject: [PATCH 11/12] bump node, import database only on build

---
 .lando.yml                               | 14 ++++++++------
 scripts/import_db.sh                     | 16 +++++++++++-----
 scripts/pressbooks_required_libraries.sh |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.lando.yml b/.lando.yml
index 902002f..a09c0c8 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -36,8 +36,7 @@ services:
       - scripts/pressbooks_required_libraries.sh
     build:
       - composer install
-    run_as_root: 
-      - bash /app/scripts/import_db.sh /app/pb_local_db.sql
+    run_as_root:
       - bash /app/scripts/prepare_test_environment.sh
   mailhog:
     hogfrom:
@@ -45,7 +44,7 @@ services:
     type: mailhog
     overrides:
       image: anatomicjc/mailhog:1.0.1
-    portforward: 8026        
+    portforward: 8026
 tooling:
   php:
     service: appserver
@@ -57,7 +56,7 @@ tooling:
     service: node
   install-tests:
     description: Install test requirements
-    cmd: 
+    cmd:
       - appserver: scripts/prepare_test_environment.sh
   test:
     description: Run all Unit Tests
@@ -77,6 +76,9 @@ tooling:
       - appserver: composer run filter_test
   db-import-custom:
     description: Import a SQL dump into the database defined in .env
-    cmd: 
+    cmd:
       - appserver: scripts/import_db.sh
-    user: root
\ No newline at end of file
+    user: root
+events:
+  post-rebuild:
+    - database: bash /app/scripts/import_db.sh /app/pb_local_db.sql
diff --git a/scripts/import_db.sh b/scripts/import_db.sh
index 803cc89..8dac289 100755
--- a/scripts/import_db.sh
+++ b/scripts/import_db.sh
@@ -26,17 +26,23 @@ if [ -z "$SQL_FILE" ]; then
   exit 1
 fi
 
+# Create .env from .env.example if .env doesn't exist
+if [ ! -f /app/.env ]; then
+    cp /app/.env.example /app/.env
+    echo "Created .env from .env.example"
+fi
+
 # Load environment variables from .env
 set -a
 source /app/.env
 set +a
 
 if [ "$FORCE" = false ]; then
-  # Check if database exists
-  DB_EXISTS=$(mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "SHOW DATABASES LIKE '$DB_NAME';" | grep "$DB_NAME")
+  # Check if WordPress tables exist or if database is empty
+  WP_TABLES=$(mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" -e "SHOW TABLES LIKE 'wp_%';" 2>/dev/null | wc -l)
 
-  if [ -n "$DB_EXISTS" ]; then
-    echo "Database '$DB_NAME' exists. Skipping import."
+  if [ "$WP_TABLES" -gt 0 ]; then
+    echo "Database '$DB_NAME' contains WordPress tables. Skipping import."
     exit 0
   fi
 fi
@@ -54,4 +60,4 @@ mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" -e "CREATE DATABASE I
 # Import SQL
 mysql -h "$DB_HOST" -P 3306 -u "$DB_USER" -p"$DB_PASSWORD" "$DB_NAME" < "$SQL_FILE"
 
-echo "Import complete!"
\ No newline at end of file
+echo "Import complete!"
diff --git a/scripts/pressbooks_required_libraries.sh b/scripts/pressbooks_required_libraries.sh
index 40f911b..a95488e 100755
--- a/scripts/pressbooks_required_libraries.sh
+++ b/scripts/pressbooks_required_libraries.sh
@@ -32,7 +32,7 @@ else
 fi
 
 # Install latest version of Node
-curl -sL "https://deb.nodesource.com/setup_18.x" | bash - \
+curl -sL "https://deb.nodesource.com/setup_22.x" | bash - \
   && apt-get install -y nodejs
 
 # install missing xsl extension

From 80a884cafda2f408d665f9b55cdeff2cd14f34d0 Mon Sep 17 00:00:00 2001
From: Oscar Arzola <oscararzola@gmail.com>
Date: Fri, 26 Sep 2025 14:11:58 -0400
Subject: [PATCH 12/12] better event for db import

---
 .lando.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.lando.yml b/.lando.yml
index a09c0c8..bb34128 100644
--- a/.lando.yml
+++ b/.lando.yml
@@ -80,5 +80,5 @@ tooling:
       - appserver: scripts/import_db.sh
     user: root
 events:
-  post-rebuild:
+  post-start:
     - database: bash /app/scripts/import_db.sh /app/pb_local_db.sql