From 7f6d00f9e4ad41fe8120dafcfa1a3b820b867511 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Sun, 14 Jan 2018 22:44:31 +1100 Subject: [PATCH 1/4] Move the docker-compose file to the project root. --- docker/docker-compose.yml => docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename docker/docker-compose.yml => docker-compose.yml (87%) diff --git a/docker/docker-compose.yml b/docker-compose.yml similarity index 87% rename from docker/docker-compose.yml rename to docker-compose.yml index 365dbc0959c707..7f59ef133b2f21 100644 --- a/docker/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: WORDPRESS_DB_PASSWORD: example ABSPATH: /usr/src/wordpress/ volumes: - - ../:/var/www/html/wp-content/plugins/gutenberg + - .:/var/www/html/wp-content/plugins/gutenberg container_name: wordpress-dev mysql: @@ -24,7 +24,7 @@ services: environment: PHPUNIT_DB_HOST: mysql volumes: - - ..:/app + - .:/app - testsuite:/tmp volumes: From 895b8b1c796659be9e20db5b35e292700f8c7589 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Sun, 14 Jan 2018 22:45:13 +1100 Subject: [PATCH 2/4] When setting up the local environment, "docker-compose up" will fail if there's an existing wordpress-dev container. Remove it, and retry. --- bin/setup-local-env.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/setup-local-env.sh b/bin/setup-local-env.sh index 1fd78eddc7e03b..69f4fdf431a44f 100755 --- a/bin/setup-local-env.sh +++ b/bin/setup-local-env.sh @@ -4,10 +4,15 @@ set -e # Change to the expected directory -cd "$(dirname "$0")/../docker" +cd "$(dirname "$0")/.." # Launch the containers -docker-compose up -d +if ! docker-compose up -d; then + # Launching may fail due to the docker config file directory having changed. + # Remove the old wordpress-dev container, and try again. + docker container rm -fv wordpress-dev + docker-compose up -d +fi # Wait until the docker containers are setup properely echo "Attempting to connect to wordpress" From a150e67676e86f4609782ad6593985b2b9168f5e Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Sun, 14 Jan 2018 22:45:31 +1100 Subject: [PATCH 3/4] Remove references to the old docker-compose.yml location. --- bin/run-wp-unit-tests.sh | 4 ++-- package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/run-wp-unit-tests.sh b/bin/run-wp-unit-tests.sh index 333bbea525d8e4..cdea34e9dec45d 100755 --- a/bin/run-wp-unit-tests.sh +++ b/bin/run-wp-unit-tests.sh @@ -27,8 +27,8 @@ fi echo Running with the following versions: if [ ${DOCKER} = "true" ]; then - docker-compose -f docker/docker-compose.yml run --rm wordpress_phpunit php -v - docker-compose -f docker/docker-compose.yml run --rm wordpress_phpunit phpunit --version + docker-compose run --rm wordpress_phpunit php -v + docker-compose run --rm wordpress_phpunit phpunit --version else php -v phpunit --version diff --git a/package.json b/package.json index e6d6de7b9115e6..4112799a5be243 100644 --- a/package.json +++ b/package.json @@ -146,13 +146,13 @@ "test-php": "npm run lint-php && npm run test-unit-php", "ci": "concurrently \"npm run lint && npm run build\" \"npm run test-unit:coverage-ci\"", "fixtures:clean": "rimraf \"blocks/test/fixtures/*.+(json|serialized.html)\"", - "fixtures:server-registered": "docker-compose -f docker/docker-compose.yml run -w /var/www/html/wp-content/plugins/gutenberg --rm wordpress ./bin/get-server-blocks.php > blocks/test/server-registered.json", + "fixtures:server-registered": "docker-compose run -w /var/www/html/wp-content/plugins/gutenberg --rm wordpress ./bin/get-server-blocks.php > blocks/test/server-registered.json", "fixtures:generate": "npm run fixtures:server-registered && cross-env GENERATE_MISSING_FIXTURES=y npm run test-unit", "fixtures:regenerate": "npm run fixtures:clean && npm run fixtures:generate", "package-plugin": "./bin/build-plugin-zip.sh", "test-unit": "jest", - "test-unit-php": "docker-compose -f docker/docker-compose.yml run --rm wordpress_phpunit phpunit", - "test-unit-php-multisite": "docker-compose -f docker/docker-compose.yml run -e WP_MULTISITE=1 --rm wordpress_phpunit phpunit", + "test-unit-php": "docker-compose run --rm wordpress_phpunit phpunit", + "test-unit-php-multisite": "docker-compose run -e WP_MULTISITE=1 --rm wordpress_phpunit phpunit", "test-unit:coverage": "jest --coverage", "test-unit:coverage-ci": "jest --coverage --maxWorkers 1 && codecov", "test-unit:watch": "jest --watch", From deb7dea1a0b3a78dc6f549bb4447c950d667def1 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Sun, 14 Jan 2018 22:45:45 +1100 Subject: [PATCH 4/4] Ignore docker-compose.override.yml --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96d44d49cb7fc4..22284c685d32c9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gutenberg.zip *.log phpcs.xml yarn.lock +docker-compose.override.yml