Changeset 53895

Timestamp:

08/13/2022 11:23:26 PM (2 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Move the Memcached container into the Docker Compose config.

This allows a developer to use the persistent Memcached object cache on their local development environment via the LOCAL_PHP_MEMCACHED environment variable.

Enable the memcached config via LOCAL_PHP_MEMCACHED=true in the .env file and then restart the environment with npm run env:restart.

Fixes #55700

Location:

trunk

Files:

• .github/workflows/phpunit-tests.yml (modified) (2 diffs)
• docker-compose.yml (modified) (2 diffs)
• tools/local-env/scripts/start.js (modified) (1 diff)

trunk/.github/workflows/phpunit-tests.yml

@@ -47 +47 @@
   # - Logs Docker debug information (about the Docker installation within the runner).
   # - Starts the WordPress Docker container.
-  # - Starts the Memcached server after the Docker network has been created (if desired).
   # - Logs general debug information about the runner.
   # - Logs the running Docker containers.
@@ -160 +159 @@
           npm run env:start
 
-      # The memcached server needs to start after the Docker network has been set up with `npm run env:start`.
-      - name: Start the Memcached server.
-        if: ${{ matrix.memcached }}
-        run: |
-          cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
-          docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
-
       - name: General debug information
         run: |

trunk/docker-compose.yml

@@ -49 +49 @@
       - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
       - ./:/var/www
+
+    # Copy or delete the Memcached dropin plugin file as appropriate.
+    command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm"
 
     depends_on:
@@ -105 +108 @@
       - localhost:host-gateway
 
+  ##
+  # The Memcached container.
+  ##
+  memcached:
+    image: memcached
+
+    networks:
+      - wpdevnet
+
+    ports:
+      - 11211:11211
+
 volumes:
   # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.

trunk/tools/local-env/scripts/start.js

@@ -10 +10 @@
 
 // Start the local-env containers.
-execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );
+const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
+    ? 'wordpress-develop memcached'
+    : 'wordpress-develop';
+execSync( `docker-compose up -d -- ${containers}`, { stdio: 'inherit' } );
 
 // If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.