This is an automated email from the ASF dual-hosted git repository.
yikun 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 6f36415 [SPARK-44168] Add Apache Spark 3.4.1 Dockerfiles
6f36415 is described below
commit 6f3641534a97a80491cba926cc7a5e67972494ea
Author: Yikun Jiang <yikunk...@gmail.com>
AuthorDate: Sun Jun 25 10:51:46 2023 +0800
[SPARK-44168] Add Apache Spark 3.4.1 Dockerfiles
### What changes were proposed in this pull request?
Add Apache Spark 3.4.1 Dockerfiles.
- Add 3.4.1 GPG key
- Add .github/workflows/build_3.4.1.yaml
- ./add-dockerfiles.sh 3.4.1
- Add version and tag info
### Why are the changes needed?
Apache Spark 3.4.1 released:
https://spark.apache.org/releases/spark-release-3-4-1.html
### Does this PR introduce _any_ user-facing change?
Docker image will be published.
### How was this patch tested?
Add workflow and CI passed
Closes #46 from Yikun/3.4.1.
Authored-by: Yikun Jiang <yikunk...@gmail.com>
Signed-off-by: Yikun Jiang <yikunk...@gmail.com>
---
.github/workflows/build_3.4.1.yaml | 41 +++++++
.github/workflows/publish.yml | 3 +-
.github/workflows/test.yml | 3 +-
3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile | 30 +++++
3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile | 27 +++++
3.4.1/scala2.12-java11-r-ubuntu/Dockerfile | 29 +++++
3.4.1/scala2.12-java11-ubuntu/Dockerfile | 81 ++++++++++++++
3.4.1/scala2.12-java11-ubuntu/entrypoint.sh | 123 +++++++++++++++++++++
tools/template.py | 2 +
versions.json | 42 +++++--
10 files changed, 372 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build_3.4.1.yaml
b/.github/workflows/build_3.4.1.yaml
new file mode 100644
index 0000000..2eba18e
--- /dev/null
+++ b/.github/workflows/build_3.4.1.yaml
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: "Build and Test (3.4.1)"
+
+on:
+ pull_request:
+ branches:
+ - 'master'
+ paths:
+ - '3.4.1/**'
+
+jobs:
+ run-build:
+ strategy:
+ matrix:
+ image-type: ["all", "python", "scala", "r"]
+ name: Run
+ secrets: inherit
+ uses: ./.github/workflows/main.yml
+ with:
+ spark: 3.4.1
+ scala: 2.12
+ java: 11
+ image-type: ${{ matrix.image-type }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3063bfe..1138a9f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,9 +25,10 @@ on:
spark:
description: 'The Spark version of Spark image.'
required: true
- default: '3.4.0'
+ default: '3.4.1'
type: choice
options:
+ - 3.4.1
- 3.4.0
- 3.3.2
- 3.3.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 06e2321..4136f1c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,9 +25,10 @@ on:
spark:
description: 'The Spark version of Spark image.'
required: true
- default: '3.4.0'
+ default: '3.4.1'
type: choice
options:
+ - 3.4.1
- 3.4.0
- 3.3.2
- 3.3.1
diff --git a/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile
b/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile
new file mode 100644
index 0000000..95c98b9
--- /dev/null
+++ b/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM spark:3.4.1-scala2.12-java11-ubuntu
+
+USER root
+
+RUN set -ex; \
+ apt-get update; \
+ apt install -y python3 python3-pip; \
+ apt install -y r-base r-base-dev; \
+ rm -rf /var/cache/apt/*; \
+ rm -rf /var/lib/apt/lists/*
+
+ENV R_HOME /usr/lib/R
+
+USER spark
diff --git a/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile
b/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile
new file mode 100644
index 0000000..8b4dcc9
--- /dev/null
+++ b/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM spark:3.4.1-scala2.12-java11-ubuntu
+
+USER root
+
+RUN set -ex; \
+ apt-get update; \
+ apt install -y python3 python3-pip; \
+ rm -rf /var/cache/apt/*; \
+ rm -rf /var/lib/apt/lists/*
+
+USER spark
diff --git a/3.4.1/scala2.12-java11-r-ubuntu/Dockerfile
b/3.4.1/scala2.12-java11-r-ubuntu/Dockerfile
new file mode 100644
index 0000000..a1dd367
--- /dev/null
+++ b/3.4.1/scala2.12-java11-r-ubuntu/Dockerfile
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM spark:3.4.1-scala2.12-java11-ubuntu
+
+USER root
+
+RUN set -ex; \
+ apt-get update; \
+ apt install -y r-base r-base-dev; \
+ rm -rf /var/cache/apt/*; \
+ rm -rf /var/lib/apt/lists/*
+
+ENV R_HOME /usr/lib/R
+
+USER spark
diff --git a/3.4.1/scala2.12-java11-ubuntu/Dockerfile
b/3.4.1/scala2.12-java11-ubuntu/Dockerfile
new file mode 100644
index 0000000..8028ce6
--- /dev/null
+++ b/3.4.1/scala2.12-java11-ubuntu/Dockerfile
@@ -0,0 +1,81 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM eclipse-temurin:11-jre-focal
+
+ARG spark_uid=185
+
+RUN groupadd --system --gid=${spark_uid} spark && \
+ useradd --system --uid=${spark_uid} --gid=spark spark
+
+RUN set -ex; \
+ apt-get update; \
+ ln -s /lib /lib64; \
+ apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user
libnss3 procps net-tools gosu libnss-wrapper; \
+ mkdir -p /opt/spark; \
+ mkdir /opt/spark/python; \
+ mkdir -p /opt/spark/examples; \
+ mkdir -p /opt/spark/work-dir; \
+ chmod g+w /opt/spark/work-dir; \
+ touch /opt/spark/RELEASE; \
+ chown -R spark:spark /opt/spark; \
+ echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
+ rm -rf /var/cache/apt/*; \
+ rm -rf /var/lib/apt/lists/*
+
+# Install Apache Spark
+# https://downloads.apache.org/spark/KEYS
+ENV
SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.4.1/spark-3.4.1-bin-hadoop3.tgz
\
+
SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.4.1/spark-3.4.1-bin-hadoop3.tgz.asc
\
+ GPG_KEY=34F0FC5C
+
+RUN set -ex; \
+ export SPARK_TMP="$(mktemp -d)"; \
+ cd $SPARK_TMP; \
+ wget -nv -O spark.tgz "$SPARK_TGZ_URL"; \
+ wget -nv -O spark.tgz.asc "$SPARK_TGZ_ASC_URL"; \
+ export GNUPGHOME="$(mktemp -d)"; \
+ gpg --keyserver hkps://keys.openpgp.org --recv-key "$GPG_KEY" || \
+ gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$GPG_KEY"; \
+ gpg --batch --verify spark.tgz.asc spark.tgz; \
+ gpgconf --kill all; \
+ rm -rf "$GNUPGHOME" spark.tgz.asc; \
+ \
+ tar -xf spark.tgz --strip-components=1; \
+ chown -R spark:spark .; \
+ mv jars /opt/spark/; \
+ mv bin /opt/spark/; \
+ mv sbin /opt/spark/; \
+ mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
+ mv examples /opt/spark/; \
+ mv kubernetes/tests /opt/spark/; \
+ mv data /opt/spark/; \
+ mv python/pyspark /opt/spark/python/pyspark/; \
+ mv python/lib /opt/spark/python/lib/; \
+ mv R /opt/spark/; \
+ chmod a+x /opt/decom.sh; \
+ cd ..; \
+ rm -rf "$SPARK_TMP";
+
+COPY entrypoint.sh /opt/
+
+ENV SPARK_HOME /opt/spark
+
+WORKDIR /opt/spark/work-dir
+
+USER spark
+
+ENTRYPOINT [ "/opt/entrypoint.sh" ]
diff --git a/3.4.1/scala2.12-java11-ubuntu/entrypoint.sh
b/3.4.1/scala2.12-java11-ubuntu/entrypoint.sh
new file mode 100755
index 0000000..08fc925
--- /dev/null
+++ b/3.4.1/scala2.12-java11-ubuntu/entrypoint.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+attempt_setup_fake_passwd_entry() {
+ # Check whether there is a passwd entry for the container UID
+ local myuid; myuid="$(id -u)"
+ # If there is no passwd entry for the container UID, attempt to fake one
+ # You can also refer to the
https://github.com/docker-library/official-images/pull/13089#issuecomment-1534706523
+ # It's to resolve OpenShift random UID case.
+ # See also: https://github.com/docker-library/postgres/pull/448
+ if ! getent passwd "$myuid" &> /dev/null; then
+ local wrapper
+ for wrapper in {/usr,}/lib{/*,}/libnss_wrapper.so; do
+ if [ -s "$wrapper" ]; then
+ NSS_WRAPPER_PASSWD="$(mktemp)"
+ NSS_WRAPPER_GROUP="$(mktemp)"
+ export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
+ local mygid; mygid="$(id -g)"
+ printf 'spark:x:%s:%s:${SPARK_USER_NAME:-anonymous
uid}:%s:/bin/false\n' "$myuid" "$mygid" "$SPARK_HOME" > "$NSS_WRAPPER_PASSWD"
+ printf 'spark:x:%s:\n' "$mygid" > "$NSS_WRAPPER_GROUP"
+ break
+ fi
+ done
+ fi
+}
+
+if [ -z "$JAVA_HOME" ]; then
+ JAVA_HOME=$(java -XshowSettings:properties -version 2>&1 > /dev/null | grep
'java.home' | awk '{print $3}')
+fi
+
+SPARK_CLASSPATH="$SPARK_CLASSPATH:${SPARK_HOME}/jars/*"
+for v in "${!SPARK_JAVA_OPT_@}"; do
+ SPARK_EXECUTOR_JAVA_OPTS+=( "${!v}" )
+done
+
+if [ -n "$SPARK_EXTRA_CLASSPATH" ]; then
+ SPARK_CLASSPATH="$SPARK_CLASSPATH:$SPARK_EXTRA_CLASSPATH"
+fi
+
+if ! [ -z ${PYSPARK_PYTHON+x} ]; then
+ export PYSPARK_PYTHON
+fi
+if ! [ -z ${PYSPARK_DRIVER_PYTHON+x} ]; then
+ export PYSPARK_DRIVER_PYTHON
+fi
+
+# If HADOOP_HOME is set and SPARK_DIST_CLASSPATH is not set, set it here so
Hadoop jars are available to the executor.
+# It does not set SPARK_DIST_CLASSPATH if already set, to avoid overriding
customizations of this value from elsewhere e.g. Docker/K8s.
+if [ -n "${HADOOP_HOME}" ] && [ -z "${SPARK_DIST_CLASSPATH}" ]; then
+ export SPARK_DIST_CLASSPATH="$($HADOOP_HOME/bin/hadoop classpath)"
+fi
+
+if ! [ -z ${HADOOP_CONF_DIR+x} ]; then
+ SPARK_CLASSPATH="$HADOOP_CONF_DIR:$SPARK_CLASSPATH";
+fi
+
+if ! [ -z ${SPARK_CONF_DIR+x} ]; then
+ SPARK_CLASSPATH="$SPARK_CONF_DIR:$SPARK_CLASSPATH";
+elif ! [ -z ${SPARK_HOME+x} ]; then
+ SPARK_CLASSPATH="$SPARK_HOME/conf:$SPARK_CLASSPATH";
+fi
+
+# Switch to spark if no USER specified (root by default) otherwise use USER
directly
+switch_spark_if_root() {
+ if [ $(id -u) -eq 0 ]; then
+ echo gosu spark
+ fi
+}
+
+case "$1" in
+ driver)
+ shift 1
+ CMD=(
+ "$SPARK_HOME/bin/spark-submit"
+ --conf "spark.driver.bindAddress=$SPARK_DRIVER_BIND_ADDRESS"
+ --deploy-mode client
+ "$@"
+ )
+ attempt_setup_fake_passwd_entry
+ # Execute the container CMD under tini for better hygiene
+ exec $(switch_spark_if_root) /usr/bin/tini -s -- "${CMD[@]}"
+ ;;
+ executor)
+ shift 1
+ CMD=(
+ ${JAVA_HOME}/bin/java
+ "${SPARK_EXECUTOR_JAVA_OPTS[@]}"
+ -Xms$SPARK_EXECUTOR_MEMORY
+ -Xmx$SPARK_EXECUTOR_MEMORY
+ -cp "$SPARK_CLASSPATH:$SPARK_DIST_CLASSPATH"
+ org.apache.spark.scheduler.cluster.k8s.KubernetesExecutorBackend
+ --driver-url $SPARK_DRIVER_URL
+ --executor-id $SPARK_EXECUTOR_ID
+ --cores $SPARK_EXECUTOR_CORES
+ --app-id $SPARK_APPLICATION_ID
+ --hostname $SPARK_EXECUTOR_POD_IP
+ --resourceProfileId $SPARK_RESOURCE_PROFILE_ID
+ --podName $SPARK_EXECUTOR_POD_NAME
+ )
+ attempt_setup_fake_passwd_entry
+ # Execute the container CMD under tini for better hygiene
+ exec $(switch_spark_if_root) /usr/bin/tini -s -- "${CMD[@]}"
+ ;;
+
+ *)
+ # Non-spark-on-k8s command provided, proceeding in pass-through mode...
+ exec "$@"
+ ;;
+esac
diff --git a/tools/template.py b/tools/template.py
index cb74cc3..93e842a 100755
--- a/tools/template.py
+++ b/tools/template.py
@@ -30,6 +30,8 @@ GPG_KEY_DICT = {
"3.3.2": "C56349D886F2B01F8CAE794C653C2301FEA493EE",
# issuer "xinr...@apache.org"
"3.4.0": "CC68B3D16FE33A766705160BA7E57908C7A4E1B1",
+ # issuer "dongj...@apache.org"
+ "3.4.1": "34F0FC5C"
}
diff --git a/versions.json b/versions.json
index edc20b6..3ef0101 100644
--- a/versions.json
+++ b/versions.json
@@ -1,29 +1,57 @@
{
"versions": [
+ {
+ "path": "3.4.1/scala2.12-java11-python3-ubuntu",
+ "tags": [
+ "3.4.1-scala2.12-java11-python3-ubuntu",
+ "3.4.1-python3",
+ "3.4.1",
+ "python3",
+ "latest"
+ ]
+ },
+ {
+ "path": "3.4.1/scala2.12-java11-r-ubuntu",
+ "tags": [
+ "3.4.1-scala2.12-java11-r-ubuntu",
+ "3.4.1-r",
+ "r"
+ ]
+ },
+ {
+ "path": "3.4.1/scala2.12-java11-ubuntu",
+ "tags": [
+ "3.4.1-scala2.12-java11-ubuntu",
+ "3.4.1-scala",
+ "scala"
+ ]
+ },
+ {
+ "path": "3.4.1/scala2.12-java11-python3-r-ubuntu",
+ "tags": [
+ "3.4.1-scala2.12-java11-python3-r-ubuntu"
+ ]
+ },
{
"path": "3.4.0/scala2.12-java11-python3-ubuntu",
"tags": [
"3.4.0-scala2.12-java11-python3-ubuntu",
"3.4.0-python3",
- "3.4.0",
- "python3",
- "latest"
+ "3.4.0"
]
},
{
"path": "3.4.0/scala2.12-java11-r-ubuntu",
"tags": [
"3.4.0-scala2.12-java11-r-ubuntu",
- "3.4.0-r",
- "r"
+ "3.4.0-r"
]
},
{
"path": "3.4.0/scala2.12-java11-ubuntu",
"tags": [
"3.4.0-scala2.12-java11-ubuntu",
- "3.4.0-scala",
- "scala"
+ "3.4.0-scala"
]
},
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
