hello-stephen opened a new pull request, #400: URL: https://github.com/apache/doris-thirdparty/pull/400
## Problem Upstream PR [apache/doris#65516](https://github.com/apache/doris/pull/65516) switched the Docker image from `centos:7` to `almalinux:8`. This breaks the Dockerfile patching logic in `.github/workflows/build.yml`: 1. **Old Patch 1 (epel mirror fix)**: The old centos7 Dockerfile used `yum install epel-release`, but the new almalinux:8 Dockerfile uses `dnf` and no longer installs epel. This patch would fail its assertion. 2. **Old Patch 3 (USE_AVX2=0)**: The PATH in the new Dockerfile changed from `PATH="/var/local/ldb-toolchain/bin/:$PATH"` to `PATH="/root/.cargo/bin:/var/local/ldb-toolchain/bin/:$PATH"` (added Rust toolchain). The old pattern wouldn't match. ## Changes 1. **Remove epel patch** — no longer needed since almalinux:8 uses dnf 2. **Add line ending normalization** (`\r\n` → `\n`) for robust regex matching against GitHub's raw content 3. **Update USE_AVX2 patch** to match the new PATH that includes `/root/.cargo/bin` 4. **Renumber patches** accordingly (old Patch 2 → Patch 1, old Patch 3 → Patch 2) ## Verification Tested the updated Python script end-to-end against the current upstream Dockerfile (master branch): - ✅ Patch 1 (prebuilt replace): OK - ✅ Patch 2 (USE_AVX2): OK - ✅ No source build commands in patched Dockerfiles - ✅ Prebuilt download correctly inserted - ✅ USE_AVX2 correctly commented/uncommented in normal/noavx2 variants 🤖 Generated with [Claude Code](https://claude.com/claude-code) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
