update docker-run on chihounds, force install

chihounds/docker-run.sh

@@ -1,4 +1,4 @@
 cd "$(dirname "$0")"
 PROJECT_NAME=selig
 CONTAINER_NAME=chihounds
-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 "$@"
+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 "$@"

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 "$@"
+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 "$@"

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 
-  echo "Replacing default site url (https://localhost->$WORDPRESS_SITEURL)" 
-  wp search-replace "https://localhost" "$WORDPRESS_SITEURL" --format=count
+  wp db import /data/import.sql
+  echo "Replacing default site url ($(wp option get siteurl)->$WORDPRESS_SITEURL)" 
+  wp search-replace "$(wp option get siteurl)" "$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

shared/wp-install.sh

@@ -2,6 +2,6 @@ cd "$(dirname "$0")"
 ./wp-cli.sh sh -c '
 wp db create || true && \
 wp core install --title="$WORDPRESS_TITLE" --url="$WORDPRESS_SITEURL" --admin_user=$WORDPRESS_ADMIN_USER --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password=$WORDPRESS_ADMIN_PASSWORD && \
-wp theme install $WP_THEMES --activate; \
-wp plugin install $WP_PLUGINS --activate
+wp theme install $WP_THEMES --activate --force; \
+wp plugin install $WP_PLUGINS --activate --force 
 '