Changeset 57927

Timestamp:

04/04/2024 06:10:44 PM (10 months ago)

Author:

desrosj

Message:

Build/Test Tools: Migrate to Docker Compose V2.

Compose V2, which was first released in 2020, is included with all currently supported versions of Docker Desktop. Compose V1 stopped receiving updates in July 2023.

The biggest difference is that the command to interact with Compose changed from docker-compose to docker compose.

GitHub has now started removing V1 from Ubuntu & Windows images, which caused all Docker-based GitHub Actions workflows to fail.

This change migrates to the new docker compose command to address these failures.

Merges [57918] to the 6.5 branch.

Props swissspidy, thelovekesh.
See #60901.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• .github/workflows/end-to-end-tests.yml (modified) (1 diff)
• .github/workflows/performance.yml (modified) (1 diff)
• .github/workflows/phpunit-tests-run.yml (modified) (3 diffs)
• .github/workflows/test-coverage.yml (modified) (2 diffs)
• tools/local-env/scripts/docker.js (modified) (1 diff)
• tools/local-env/scripts/install.js (modified) (2 diffs)
• tools/local-env/scripts/start.js (modified) (1 diff)

branches/6.5/.github/workflows/end-to-end-tests.yml

@@ -109 +109 @@
         run: |
           docker -v
-          docker-compose -v
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
+          docker compose run --rm mysql mysql --version
+          docker compose run --rm php php --version
+          docker compose run --rm php php -m
+          docker compose run --rm php php -i
+          docker compose run --rm php locale -a
 
       - name: Install WordPress

branches/6.5/.github/workflows/performance.yml

@@ -143 +143 @@
         run: |
           docker -v
-          docker-compose -v
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
+          docker compose run --rm mysql mysql --version
+          docker compose run --rm php php --version
+          docker compose run --rm php php -m
+          docker compose run --rm php php -i
+          docker compose run --rm php locale -a
 
       - name: Install WordPress

branches/6.5/.github/workflows/phpunit-tests-run.yml

@@ -131 +131 @@
         run: |
           docker -v
-          docker-compose -v
 
       - name: Start Docker environment
@@ -142 +141 @@
       - name: WordPress Docker container debug information
         run: |
-          docker-compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
+          docker compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version
+          docker compose run --rm php php --version
+          docker compose run --rm php php -m
+          docker compose run --rm php php -i
+          docker compose run --rm php locale -a
 
       - name: Install WordPress
@@ -185 +184 @@
         env:
           WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
-        run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
+        run: docker compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php

branches/6.5/.github/workflows/test-coverage.yml

@@ -124 +124 @@
         run: |
           docker -v
-          docker-compose -v
 
       - name: Start Docker environment
@@ -135 +134 @@
       - name: WordPress Docker container debug information
         run: |
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
+          docker compose run --rm mysql mysql --version
+          docker compose run --rm php php --version
+          docker compose run --rm php php -m
+          docker compose run --rm php php -i
+          docker compose run --rm php locale -a
 
       - name: Install WordPress

branches/6.5/tools/local-env/scripts/docker.js

@@ -5 +5 @@
 dotenvExpand.expand( dotenv.config() );
 
-// Execute any docker-compose command passed to this script.
-execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
+// Execute any docker compose command passed to this script.
+execSync( 'docker compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

branches/6.5/tools/local-env/scripts/install.js

@@ -47 +47 @@
  */
 function wp_cli( cmd ) {
-    execSync( `docker-compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
+    execSync( `docker compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
 }
 
@@ -56 +56 @@
     const testPluginDirectory = 'tests/phpunit/data/plugins/wordpress-importer';
 
-    execSync( `docker-compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
-    execSync( `docker-compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
+    execSync( `docker compose exec -T php rm -rf ${testPluginDirectory}`, { stdio: 'inherit' } );
+    execSync( `docker compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
 }

branches/6.5/tools/local-env/scripts/start.js

@@ -20 +20 @@
     ? 'wordpress-develop memcached'
     : 'wordpress-develop';
-execSync( `docker-compose up -d ${containers}`, { stdio: 'inherit' } );
+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.