From c4fc732a46395ade59fc3e55e3a260be596e30f5 Mon Sep 17 00:00:00 2001
From: Anthony Correa <a@correa.co>
Date: Sun, 17 Dec 2023 16:46:31 -0600
Subject: [PATCH] mount entire data folder instead

---
 cmbabaseball/docker-run.sh |  2 +-
 shared/wp-import.sh        | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/cmbabaseball/docker-run.sh b/cmbabaseball/docker-run.sh
index 3848c9f..8c99829 100755
--- a/cmbabaseball/docker-run.sh
+++ b/cmbabaseball/docker-run.sh
@@ -1,4 +1,4 @@
 cd "$(dirname "$0")"
 PROJECT_NAME=selig
 CONTAINER_NAME=cmbabaseball
-docker run --rm --user 33:33 --volume ${PROJECT_NAME}_${CONTAINER_NAME}-wpdata:/var/www/html --env-file ../.env --env-file .env  --network ${PROJECT_NAME}_network "$@"
\ No newline at end of file
+docker run --rm --user 33:33 --volume ${PROJECT_NAME}_${CONTAINER_NAME}-wpdata:/var/www/html --volume ./data:/data --env-file ../.env --env-file .env  --network ${PROJECT_NAME}_network "$@"
\ No newline at end of file
diff --git a/shared/wp-import.sh b/shared/wp-import.sh
index a5974fc..d1db728 100755
--- a/shared/wp-import.sh
+++ b/shared/wp-import.sh
@@ -1,28 +1,24 @@
 cd "$(dirname "$0")"
 
-./docker-run.sh \
--v ./data/import.sql:/import.sql  \
--v ./data/import-uploads.tgz:/import-uploads.tgz  \
--v ./data/plugins:/import-plugins  \
-wordpress:cli sh -c '
+./wp-cli.sh sh -c '
 
-if [ -f /import.sql ]; then 
+if [ -f /data/import.sql ]; then 
   echo "Importing Database..." 
-  wp db query < /import.sql 
+  wp db import /data/import.sql 
   echo "Replacing default site url (https://localhost->$WORDPRESS_SITEURL)" 
   wp search-replace "https://localhost" "$WORDPRESS_SITEURL" --format=count
   echo "Re-adding the admin user"
   wp user create $WORDPRESS_ADMIN_USER $WORDPRESS_ADMIN_EMAIL --user_pass=$WORDPRESS_ADMIN_PASSWORD --role=administrator --porcelain
   echo "Done." 
 fi && \
-if [ -f /import-uploads.tgz ]; then 
+if [ -f /data/import-uploads.tgz ]; then 
   echo "Importing Uploads..." 
-  tar -xz --overwrite -f /import-uploads.tgz -C /var/www/html/wp-content/uploads . 
+  tar -xz --overwrite -f /data/import-uploads.tgz -C /var/www/html/wp-content/uploads . 
   echo "Done." 
 fi && \
-if [ -n "$(ls -A /import-plugins 2>/dev/null)" ]; then 
+if [ -n "$(ls -A /data/import-plugins 2>/dev/null)" ]; then 
   echo "Importing Plugins..."
-  for I in /import-plugins/*.zip; do
+  for I in /data/import-plugins/*.zip; do
    [ -f "$I" ] || continue
     echo "$I"
     wp plugin install "$I" --activate