From 829a4c0a4de116055a6a7ff353b618431017c66a Mon Sep 17 00:00:00 2001 From: Ninos Ego Date: Mon, 30 Jun 2025 07:21:02 +0200 Subject: [PATCH] Build/Test Tools: Remove unnecessary `docker` branding --- .devcontainer/devcontainer.json | 2 +- ...ent.yml => local-development-environment.yml} | 16 ++++++++-------- ...le-test-local-development-environment-v1.yml} | 2 +- .github/workflows/test-coverage.yml | 4 ++-- .gitignore | 2 ++ docker-compose.yml => compose.yml | 10 +++++----- tools/local-env/scripts/utils.js | 8 ++++---- 7 files changed, 23 insertions(+), 21 deletions(-) rename .github/workflows/{local-docker-environment.yml => local-development-environment.yml} (92%) rename .github/workflows/{reusable-test-local-docker-environment-v1.yml => reusable-test-local-development-environment-v1.yml} (99%) rename docker-compose.yml => compose.yml (93%) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a82f998c83d0d..b597ce7751e60 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/devcontainer.json. { "name": "WordPress Core Development", - "dockerComposeFile": "docker-compose.yml", + "dockerComposeFile": "compose.yml", "service": "app", "workspaceFolder": "/workspace", diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-development-environment.yml similarity index 92% rename from .github/workflows/local-docker-environment.yml rename to .github/workflows/local-development-environment.yml index d8312015f621c..e1d39bae385fa 100644 --- a/.github/workflows/local-docker-environment.yml +++ b/.github/workflows/local-development-environment.yml @@ -1,4 +1,4 @@ -name: Local Docker Environment +name: Local Development Environment on: push: @@ -9,7 +9,7 @@ on: paths: # Any changes to Docker related files. - '.env.example' - - 'docker-compose.yml' + - 'compose.yml' # Any changes to local environment related files - 'tools/local-env/**' # These files configure npm and the task runner. Changes could affect the outcome. @@ -22,9 +22,9 @@ on: # These files define the versions to test. - '.version-support-*.json' # Changes to this and related workflow files should always be verified. - - '.github/workflows/local-docker-environment.yml' + - '.github/workflows/local-development-environment.yml' - '.github/workflows/reusable-support-json-reader-v1.yml' - - '.github/workflows/reusable-test-docker-environment-v1.yml' + - '.github/workflows/reusable-test-local-development-environment-v1.yml' pull_request: branches: - trunk @@ -33,7 +33,7 @@ on: paths: # Any changes to Docker related files. - '.env.example' - - 'docker-compose.yml' + - 'compose.yml' # Any changes to local environment related files - 'tools/local-env/**' # These files configure npm and the task runner. Changes could affect the outcome. @@ -46,9 +46,9 @@ on: # These files define the versions to test. - '.version-support-*.json' # Changes to this and related workflow files should always be verified. - - '.github/workflows/local-docker-environment.yml' + - '.github/workflows/local-development-environment.yml' - '.github/workflows/reusable-support-json-reader-v1.yml' - - '.github/workflows/reusable-test-docker-environment-v1.yml' + - '.github/workflows/reusable-test-local-development-environment-v1.yml' workflow_dispatch: # Cancels all previous workflow runs for pull requests that have not completed. @@ -80,7 +80,7 @@ jobs: # Tests the local Docker environment. environment-tests-mysql: name: PHP ${{ matrix.php }} - uses: ./.github/workflows/reusable-test-local-docker-environment-v1.yml + uses: ./.github/workflows/reusable-test-local-development-environment-v1.yml permissions: contents: read needs: [ build-test-matrix ] diff --git a/.github/workflows/reusable-test-local-docker-environment-v1.yml b/.github/workflows/reusable-test-local-development-environment-v1.yml similarity index 99% rename from .github/workflows/reusable-test-local-docker-environment-v1.yml rename to .github/workflows/reusable-test-local-development-environment-v1.yml index c4bbfae729100..1c3955802f1af 100644 --- a/.github/workflows/reusable-test-local-docker-environment-v1.yml +++ b/.github/workflows/reusable-test-local-development-environment-v1.yml @@ -3,7 +3,7 @@ # # This workflow is used by `trunk` and branches >= 6.8. ## -name: Test local Docker environment +name: Test Local Development Environment on: workflow_call: diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index dbf9b79b9393e..ac319173bd4d0 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -8,7 +8,7 @@ on: paths: - '.github/workflows/test-coverage.yml' - '.github/workflows/reusable-phpunit-tests-v3.yml' - - 'docker-compose.yml' + - 'compose.yml' - 'phpunit.xml.dist' - 'tests/phpunit/multisite.xml' pull_request: @@ -17,7 +17,7 @@ on: paths: - '.github/workflows/test-coverage.yml' - '.github/workflows/reusable-phpunit-tests-v3.yml' - - 'docker-compose.yml' + - 'compose.yml' - 'phpunit.xml.dist' - 'tests/phpunit/multisite.xml' # Once daily at 00:00 UTC. diff --git a/.gitignore b/.gitignore index 648c711b21f26..eea16df72c019 100644 --- a/.gitignore +++ b/.gitignore @@ -104,6 +104,8 @@ wp-tests-config.php # Files for local environment config /docker-compose.override.yml +# The compose.override.yml is the new preferred Compose file name. +/compose.override.yml # Visual regression test diffs tests/visual-regression/specs/__snapshots__ diff --git a/docker-compose.yml b/compose.yml similarity index 93% rename from docker-compose.yml rename to compose.yml index 863cbd2ea9b1b..5157e4b2fd22d 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -4,7 +4,7 @@ services: # The web server container. ## wordpress-develop: - image: nginx:alpine + image: docker.io/nginx:alpine networks: - wpdevnet @@ -32,7 +32,7 @@ services: # The PHP container. ## php: - image: wordpressdevelop/php:${LOCAL_PHP-latest} + image: docker.io/wordpressdevelop/php:${LOCAL_PHP-latest} networks: - wpdevnet @@ -64,7 +64,7 @@ services: # The MySQL container. ## mysql: - image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} + image: docker.io/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} networks: - wpdevnet @@ -95,7 +95,7 @@ services: # The WP CLI container. ## cli: - image: wordpressdevelop/cli:${LOCAL_PHP-latest} + image: docker.io/wordpressdevelop/cli:${LOCAL_PHP-latest} networks: - wpdevnet @@ -130,7 +130,7 @@ services: # The Memcached container. ## memcached: - image: memcached + image: docker.io/memcached:latest networks: - wpdevnet diff --git a/tools/local-env/scripts/utils.js b/tools/local-env/scripts/utils.js index 3f3e601db2287..ff74cf6a77a97 100644 --- a/tools/local-env/scripts/utils.js +++ b/tools/local-env/scripts/utils.js @@ -8,7 +8,7 @@ const local_env_utils = { * Determines which Docker compose files are required to properly configure the local environment given the * specified PHP version, database type, and database version. * - * By default, only the standard docker-compose.yml file will be used. + * By default, only the standard compose.yml file will be used. * * When PHP 7.2 or 7.3 is used in combination with MySQL 8.4, an override file will also be returned to ensure * that the mysql_native_password plugin authentication plugin is on and available for use. @@ -16,10 +16,10 @@ const local_env_utils = { * @return {string[]} Compose files. */ get_compose_files: function() { - const composeFiles = [ 'docker-compose.yml' ]; + const composeFiles = [ 'compose.yml' ]; - if ( existsSync( 'docker-compose.override.yml' ) ) { - composeFiles.push( 'docker-compose.override.yml' ); + if ( existsSync( 'compose.override.yml' ) ) { + composeFiles.push( 'compose.override.yml' ); } if ( process.env.LOCAL_DB_TYPE !== 'mysql' ) {