From 27d8499da6e5f09e120523de23b8b8683f7d0e56 Mon Sep 17 00:00:00 2001 From: Le-Zheng Date: Thu, 22 Sep 2022 15:09:06 +0800 Subject: [PATCH] backport spark313 docker --- docker/bigdl-k8s/Dockerfile | 2 +- docker/bigdl/Dockerfile | 2 +- docker/bigdl/deployment-k8s.yaml | 4 ++-- docker/bigdl/deployment.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/bigdl-k8s/Dockerfile b/docker/bigdl-k8s/Dockerfile index 71a8e3a883d..ba029f54d6e 100644 --- a/docker/bigdl-k8s/Dockerfile +++ b/docker/bigdl-k8s/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update --fix-missing && \ ADD ./log4j2.xml ${SPARK_HOME}/conf/log4j2.xml RUN ln -fs /bin/bash /bin/sh -RUN if [ $SPARK_VERSION = "3.1.2" ]; then \ +RUN if [ $SPARK_VERSION = "3.1.3" ]; then \ rm $SPARK_HOME/jars/okhttp-*.jar && \ wget -P $SPARK_HOME/jars https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.8.0/okhttp-3.8.0.jar; \ elif [ $SPARK_VERSION = "2.4.6" ]; then \ diff --git a/docker/bigdl/Dockerfile b/docker/bigdl/Dockerfile index f8df9699b80..c6d82d903a2 100644 --- a/docker/bigdl/Dockerfile +++ b/docker/bigdl/Dockerfile @@ -57,7 +57,7 @@ RUN apt-get update --fix-missing && \ ADD ./log4j2.xml ${SPARK_HOME}/conf/log4j2.xml RUN ln -fs /bin/bash /bin/sh -RUN if [ $SPARK_VERSION = "3.1.2" ]; then \ +RUN if [ $SPARK_VERSION = "3.1.3" ]; then \ rm $SPARK_HOME/jars/okhttp-*.jar && \ wget -P $SPARK_HOME/jars https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.8.0/okhttp-3.8.0.jar; \ elif [ $SPARK_VERSION = "2.4.6" ]; then \ diff --git a/docker/bigdl/deployment-k8s.yaml b/docker/bigdl/deployment-k8s.yaml index 1e2b5f185fc..e8eceb5defb 100644 --- a/docker/bigdl/deployment-k8s.yaml +++ b/docker/bigdl/deployment-k8s.yaml @@ -16,7 +16,7 @@ spec: appType: bigdl spec: containers: - - image: intelanalytics/bigdl-spark-3.1.2:latest + - image: intelanalytics/bigdl-spark-3.1.3:latest ports: - name: jupyter-address containerPort: 12345 @@ -190,7 +190,7 @@ data: name: bigdl-notebook spark.kubernetes.authenticate.driver.serviceAccountName: spark spark.kubernetes.namespace: bigdl - spark.kubernetes.container.image: intelanalytics/bigdl-k8s-spark-3.1.2:latest + spark.kubernetes.container.image: intelanalytics/bigdl-k8s-spark-3.1.3:latest spark.driver.cores: "4" spark.driver.memory: 20g spark.executor.cores: "4" diff --git a/docker/bigdl/deployment.yaml b/docker/bigdl/deployment.yaml index 76a23c32ba8..6363041b145 100644 --- a/docker/bigdl/deployment.yaml +++ b/docker/bigdl/deployment.yaml @@ -16,7 +16,7 @@ spec: appType: bigdl spec: containers: - - image: intelanalytics/bigdl-spark-3.1.2:latest + - image: intelanalytics/bigdl-spark-3.1.3:latest ports: - name: jupyter-address containerPort: 8888