[web-php] master: Merge pull request #1410 from shivammathur/fix-docker

Author: Shivam Mathur (shivammathur) Committer: GitHub (web-flow) Pusher: shivammathur Date: 2025-09-10T11:36:50+05:30 Commit: https://github.com/php/web-php/commit/26e3cb8ca5ee7a02146144eee9102a4c936d43d8 Raw diff: https://github.com/php/web-php/commit/26e3cb8ca5ee7a02146144eee9102a4c936d43d8.diff Merge pull request #1410 from shivammathur/fix-docker Fix docker instructions for web in downloads page Changed paths: A include/download-instructions/osx-docker-cli.php A include/download-instructions/osx-docker-web.php A include/download-instructions/windows-docker-cli.php A include/download-instructions/windows-docker-web.php D include/download-instructions/osx-docker.php D include/download-instructions/windows-docker.php M downloads-get-instructions.php Diff: diff --git a/downloads-get-instructions.php b/downloads-get-instructions.php index aabc617978..83b34d237e 100644 --- a/downloads-get-instructions.php +++ b/downloads-get-instructions.php @@ -55,7 +55,11 @@ break; case 'osx': case 'windows': - $file = "{$options['osvariant']}"; + if($options['osvariant'] === "{$options['os']}-docker") { + $file = "{$options['osvariant']}-{$options['usage']}"; + } else { + $file = "{$options['osvariant']}"; + } break; } diff --git a/include/download-instructions/osx-docker.php b/include/download-instructions/osx-docker-cli.php similarity index 100% rename from include/download-instructions/osx-docker.php rename to include/download-instructions/osx-docker-cli.php diff --git a/include/download-instructions/osx-docker-web.php b/include/download-instructions/osx-docker-web.php new file mode 120000 index 0000000000..ded3a794ad --- /dev/null +++ b/include/download-instructions/osx-docker-web.php @@ -0,0 +1 @@ +linux-docker-web-community.php \ No newline at end of file diff --git a/include/download-instructions/windows-docker.php b/include/download-instructions/windows-docker-cli.php similarity index 100% rename from include/download-instructions/windows-docker.php rename to include/download-instructions/windows-docker-cli.php diff --git a/include/download-instructions/windows-docker-web.php b/include/download-instructions/windows-docker-web.php new file mode 120000 index 0000000000..ded3a794ad --- /dev/null +++ b/include/download-instructions/windows-docker-web.php @@ -0,0 +1 @@ +linux-docker-web-community.php \ No newline at end of file