This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-docker.git
The following commit(s) were added to refs/heads/master by this push:
new a5f0168 [SPARK-44935] Fix `RELEASE` file to have the correct
information in Docker images if exists
a5f0168 is described below
commit a5f016858ca0ce6809a06d3c159bfdb221df68e0
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Wed Sep 18 16:12:41 2024 -0700
[SPARK-44935] Fix `RELEASE` file to have the correct information in Docker
images if exists
### What changes were proposed in this pull request?
This PR aims to fix `RELEASE` file to have the correct information in
Docker images if exists.
Apache Spark repository already fixed this.
- https://github.com/apache/spark/pull/42636
### Why are the changes needed?
To provide a correct information for Spark 3.4+
### Does this PR introduce _any_ user-facing change?
No behavior change. Only `RELEASE` file.
### How was this patch tested?
Pass the CIs.
Closes #68 from dongjoon-hyun/SPARK-44935.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
3.4.0/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.4.1/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.4.2/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.4.3/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.5.0/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.5.0/scala2.12-java17-ubuntu/Dockerfile | 1 +
3.5.1/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.5.1/scala2.12-java17-ubuntu/Dockerfile | 1 +
3.5.2/scala2.12-java11-ubuntu/Dockerfile | 1 +
3.5.2/scala2.12-java17-ubuntu/Dockerfile | 1 +
4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile | 1 +
Dockerfile.template | 1 +
12 files changed, 12 insertions(+)
diff --git a/3.4.0/scala2.12-java11-ubuntu/Dockerfile
b/3.4.0/scala2.12-java11-ubuntu/Dockerfile
index a4b081e..c756d8a 100644
--- a/3.4.0/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.4.0/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.4.1/scala2.12-java11-ubuntu/Dockerfile
b/3.4.1/scala2.12-java11-ubuntu/Dockerfile
index d8bba7e..c18afb0 100644
--- a/3.4.1/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.4.1/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.4.2/scala2.12-java11-ubuntu/Dockerfile
b/3.4.2/scala2.12-java11-ubuntu/Dockerfile
index 2a472f9..4c28cc0 100644
--- a/3.4.2/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.4.2/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.4.3/scala2.12-java11-ubuntu/Dockerfile
b/3.4.3/scala2.12-java11-ubuntu/Dockerfile
index b749f07..4432dea 100644
--- a/3.4.3/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.4.3/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.0/scala2.12-java11-ubuntu/Dockerfile
b/3.5.0/scala2.12-java11-ubuntu/Dockerfile
index 15f4b31..afc7e9a 100644
--- a/3.5.0/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.5.0/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.0/scala2.12-java17-ubuntu/Dockerfile
b/3.5.0/scala2.12-java17-ubuntu/Dockerfile
index a2749bb..61c6687 100644
--- a/3.5.0/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.0/scala2.12-java17-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.1/scala2.12-java11-ubuntu/Dockerfile
b/3.5.1/scala2.12-java11-ubuntu/Dockerfile
index fbada2d..d5c0aea 100644
--- a/3.5.1/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.5.1/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.1/scala2.12-java17-ubuntu/Dockerfile
b/3.5.1/scala2.12-java17-ubuntu/Dockerfile
index 1682e72..4c94fde 100644
--- a/3.5.1/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.1/scala2.12-java17-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.2/scala2.12-java11-ubuntu/Dockerfile
b/3.5.2/scala2.12-java11-ubuntu/Dockerfile
index e378d88..6d23381 100644
--- a/3.5.2/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.5.2/scala2.12-java11-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/3.5.2/scala2.12-java17-ubuntu/Dockerfile
b/3.5.2/scala2.12-java17-ubuntu/Dockerfile
index 34b1214..2b92add 100644
--- a/3.5.2/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.2/scala2.12-java17-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
b/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
index 2685a87..169309a 100644
--- a/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
+++ b/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
diff --git a/Dockerfile.template b/Dockerfile.template
index c19e961..87f3377 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -55,6 +55,7 @@ RUN set -ex; \
tar -xf spark.tgz --strip-components=1; \
chown -R spark:spark .; \
mv jars /opt/spark/; \
+ mv RELEASE /opt/spark/; \
mv bin /opt/spark/; \
mv sbin /opt/spark/; \
mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
