This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 655787cae15b [SPARK-55115][INFRA] Use master branch's base Dockerfile
for release builds
655787cae15b is described below
commit 655787cae15b14a55947b2c28f7f2ac97e2fb697
Author: Wenchen Fan <[email protected]>
AuthorDate: Fri Jan 23 17:50:06 2026 +0800
[SPARK-55115][INFRA] Use master branch's base Dockerfile for release builds
### What changes were proposed in this pull request?
Modified the release GitHub Actions workflow to always use master branch's
`Dockerfile.base` when building the release Docker image, instead of using the
`Dockerfile.base` from the release branch.
### Why are the changes needed?
Old branch Dockerfiles can become unmaintainable over time due to:
- Expired GPG keys (e.g., Node.js 12 repository keys)
- Outdated base images with broken package dependencies
- Package version conflicts with aging OS versions (e.g., Ubuntu 20.04)
The master branch's `Dockerfile.base` is actively maintained and uses
modern base images (Ubuntu 22.04), making release builds more reliable. Only
the base Dockerfile is pulled from master, while the main `Dockerfile` remains
from the release branch to preserve any release-specific configurations.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Tested locally for all the active branches with all the release steps
(except for uploading)
### Was this patch authored or co-authored using generative AI tooling?
Yes. cursor 2.3.41
Closes #53890 from cloud-fan/use-master-dockerfile-for-release.
Authored-by: Wenchen Fan <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
---
.github/workflows/release.yml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e1643d9e08b..594b2e4a6c39 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -119,6 +119,13 @@ jobs:
with:
repository: apache/spark
ref: "${{ inputs.branch }}"
+ - name: Use master branch's base Dockerfile for release
+ # The release Docker image should always use master's base Dockerfile
which is actively maintained.
+ # Old branch Dockerfiles may have broken dependencies (expired GPG
keys, outdated base images, etc.)
+ run: |
+ git fetch origin master --depth=1
+ git checkout origin/master --
dev/create-release/spark-rm/Dockerfile.base
+ echo "Using master branch's Dockerfile.base for building release
image"
- name: Free up disk space
run: |
if [ -f ./dev/free_disk_space ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
