From 1fd2d7861b3961bfecf8eb0870834d56c0885626 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 9 Nov 2020 21:49:31 -0800 Subject: [PATCH 1/2] [SPARK-33408][K8S][R] Use R 4.0 in K8s R image --- .../docker/src/main/dockerfiles/spark/bindings/R/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile index 59f375b707ca7..61a089d4465f0 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile @@ -25,7 +25,10 @@ USER 0 RUN mkdir ${SPARK_HOME}/R -RUN apt-get update && apt install -y r-base r-base-dev && rm -rf /var/cache/apt/* +RUN apt-get install -y gnupg +RUN apt-key adv --keyserver keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF' +RUN echo "deb http://cloud.r-project.org/bin/linux/debian buster-cran40/" >> /etc/apt/sources.list +RUN apt-get update && apt install -y -t buster-cran40 r-base r-base-dev && rm -rf /var/cache/apt/* COPY R ${SPARK_HOME}/R ENV R_HOME /usr/lib/R From 3babd50c549fbadcfe2d64ccf7787fe31ac46708 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Wed, 11 Nov 2020 20:31:41 -0800 Subject: [PATCH 2/2] Install the matched version --- .../src/main/dockerfiles/spark/bindings/R/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile index 61a089d4465f0..bd645e40677d0 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile @@ -25,10 +25,14 @@ USER 0 RUN mkdir ${SPARK_HOME}/R -RUN apt-get install -y gnupg -RUN apt-key adv --keyserver keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF' -RUN echo "deb http://cloud.r-project.org/bin/linux/debian buster-cran40/" >> /etc/apt/sources.list -RUN apt-get update && apt install -y -t buster-cran40 r-base r-base-dev && rm -rf /var/cache/apt/* +# Install R 3.6.3 (http://cloud.r-project.org/bin/linux/debian/) +RUN \ + echo "deb http://cloud.r-project.org/bin/linux/debian buster-cran35/" >> /etc/apt/sources.list && \ + apt install -y gnupg && \ + apt-key adv --keyserver keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF' && \ + apt-get update && \ + apt install -y -t buster-cran35 r-base r-base-dev && \ + rm -rf /var/cache/apt/* COPY R ${SPARK_HOME}/R ENV R_HOME /usr/lib/R