Changeset 45783 for trunk/tools/local-env/docker-compose.yml

Timestamp:

08/12/2019 08:28:33 AM (6 years ago)

Author:

pento

Message:

Build Tools: Miscellaneous local-env improvements.

• Move the functionality for controlling local-env out of package.json, into JS scripts.
• Merge the docker-compose config files, and move it to the root directory. This allows docker-compose.override.yml to work for local overrides.
• Fix nginx redirecting to port 80 under some circumstances.
• npm run env:install now creates wp-tests.config.php for you.
• Cleaned up a bunch of cruft in .travis.yml.

See #47767.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/local-env/docker-compose.yml (modified) (4 diffs)

trunk

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml

trunk/tools/local-env/docker-compose.yml

@@ -19 +19 @@
 
     volumes:
-      - ./default.template:/etc/nginx/conf.d/default.template
-      - ../../:/var/www
+      - ./tools/local-env/default.template:/etc/nginx/conf.d/default.template
+      - ./:/var/www
 
     # Load our config file, substituning environment variables into the config.
@@ -42 +42 @@
 
     volumes:
-      - ./php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
-      - ../../:/var/www
+      - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
+      - ./:/var/www
 
     depends_on:
@@ -61 +61 @@
 
     volumes:
-      - ./mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql
+      - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql
       - mysql:/var/lib/mysql
 
@@ -67 +67 @@
     command: --default-authentication-plugin=mysql_native_password
 
+  ##
+  # The WP CLI container.
+  ##
+  cli:
+    image: wordpressdevelop/cli:${LOCAL_PHP-latest}
+
+    networks:
+      - wpdevnet
+
+    environment:
+      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
+
+    volumes:
+      - ./:/var/www
+
+    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
+    init: true
+
+  ##
+  # The PHPUnit container.
+  ##
+  phpunit:
+    image: wordpressdevelop/phpunit:${LOCAL_PHP-latest}
+
+    networks:
+      - wpdevnet
+
+    environment:
+      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
+      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
+
+    volumes:
+      - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini
+      - ./:/wordpress-develop
+      - phpunit-uploads:/wordpress-develop/${LOCAL_DIR-src}/wp-content/uploads
+
+    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
+    init: true
+
+    depends_on:
+      - mysql
+
 volumes:
   # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.
   mysql: {}
+  # Using a volume for the uploads directory improves PHPUnit performance.
+  phpunit-uploads: {}
 
 networks:

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml