Improve the build scripts

CONTRIBUTING.md

@@ -13,7 +13,7 @@ To test the plugin, or to contribute to it, you can clone this repository and bu
 First, you need a WordPress Environment to run the plugin on. The quickest way to get up and running is to use the provided docker setup. Just install [docker](https://www.docker.com/) on your machine and run `./bin/setup-local-env.sh`.
 
 The WordPress installation should be available at `http://localhost:8888` (username: `admin`, password: `password`).
-Inside the "docker" directory, you can use any docker command to interact with your containers.
+Inside the "docker" directory, you can use any docker command to interact with your containers. If this port is in use, you can override it in your `docker-compose.override.yml` file.
 
 Alternatively, you can use your own local WordPress environment and clone this repository right into your `wp-content/plugins` directory.
 

bin/install-docker.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-NVM_VERSION="v0.33.8"
 
 # Exit if any command fails
 set -e
@@ -28,17 +27,25 @@ if ! docker-compose up -d; then
 	docker-compose up -d
 fi
 
+HOST_PORT=$(docker inspect --format '{{(index (index .HostConfig.PortBindings "80/tcp") 0).HostPort}}' wordpress-dev)
+
 # Wait until the docker containers are setup properely
 echo -en $(status_message "Attempting to connect to wordpress...")
-until $(curl -L http://localhost:8888 -so - 2>&1 | grep -q "WordPress"); do
+until $(curl -L http://localhost:$HOST_PORT -so - 2>&1 | grep -q "WordPress"); do
     echo -n '.'
     sleep 5
 done
 echo ' done!'
 
 # Install WordPress
 echo -en $(status_message "Installing WordPress...")
-docker run -it --rm --volumes-from wordpress-dev --network container:wordpress-dev wordpress:cli core install --url=localhost:8888 --title=Gutenberg --admin_user=admin --admin_password=password [email protected] >/dev/null
+docker run -it --rm --volumes-from wordpress-dev --network container:wordpress-dev wordpress:cli core install --url=localhost:$HOST_PORT --title=Gutenberg --admin_user=admin --admin_password=password [email protected] >/dev/null
+
+CURRENT_URL=$(docker run -it --rm --volumes-from wordpress-dev --network container:wordpress-dev wordpress:cli option get siteurl)
+if [ "$CURRENT_URL" != "http://localhost:$HOST_PORT" ]; then
+	docker run -it --rm --volumes-from wordpress-dev --network container:wordpress-dev wordpress:cli option update home "http://localhost:$HOST_PORT"
+	docker run -it --rm --volumes-from wordpress-dev --network container:wordpress-dev wordpress:cli option update siteurl "http://localhost:$HOST_PORT"
+fi
 echo ' done!'
 
 # Activate Gutenberg
@@ -52,6 +59,5 @@ docker-compose run --rm wordpress_phpunit /app/bin/install-wp-tests.sh wordpress
 echo ' done!'
 
 # Install Composer
-echo -en $(status_message "Installing Composer...")
-docker-compose run --rm composer install >/dev/null
-echo ' done!'
+echo -e $(status_message "Installing and updating Composer modules...")
+docker-compose run --rm composer install