From 11dff45070808ce07093c176364a3557d5204e78 Mon Sep 17 00:00:00 2001 From: Yikun Jiang Date: Sun, 25 Jun 2023 16:26:56 +0800 Subject: [PATCH] Fix Signed-off-by: Yikun Jiang --- 3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile | 5 ++--- 3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile | 3 +-- 3.4.0/scala2.12-java11-r-ubuntu/Dockerfile | 3 +-- 3.4.0/scala2.12-java11-ubuntu/Dockerfile | 3 +-- 3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile | 5 ++--- 3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile | 3 +-- 3.4.1/scala2.12-java11-r-ubuntu/Dockerfile | 3 +-- 3.4.1/scala2.12-java11-ubuntu/Dockerfile | 3 +-- Dockerfile.template | 3 +-- r-python.template | 5 ++--- 10 files changed, 13 insertions(+), 23 deletions(-) diff --git a/3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile b/3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile index 0f1962f..10aa23e 100644 --- a/3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile +++ b/3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile @@ -20,9 +20,8 @@ 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/*; \ + apt-get install -y python3 python3-pip; \ + apt-get install -y r-base r-base-dev; \ rm -rf /var/lib/apt/lists/* ENV R_HOME /usr/lib/R diff --git a/3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile b/3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile index 258d806..3240e57 100644 --- a/3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile +++ b/3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile @@ -20,8 +20,7 @@ USER root RUN set -ex; \ apt-get update; \ - apt install -y python3 python3-pip; \ - rm -rf /var/cache/apt/*; \ + apt-get install -y python3 python3-pip; \ rm -rf /var/lib/apt/lists/* USER spark diff --git a/3.4.0/scala2.12-java11-r-ubuntu/Dockerfile b/3.4.0/scala2.12-java11-r-ubuntu/Dockerfile index 4c928c6..266392f 100644 --- a/3.4.0/scala2.12-java11-r-ubuntu/Dockerfile +++ b/3.4.0/scala2.12-java11-r-ubuntu/Dockerfile @@ -20,8 +20,7 @@ USER root RUN set -ex; \ apt-get update; \ - apt install -y r-base r-base-dev; \ - rm -rf /var/cache/apt/*; \ + apt-get install -y r-base r-base-dev; \ rm -rf /var/lib/apt/lists/* ENV R_HOME /usr/lib/R diff --git a/3.4.0/scala2.12-java11-ubuntu/Dockerfile b/3.4.0/scala2.12-java11-ubuntu/Dockerfile index aa754b7..77ace47 100644 --- a/3.4.0/scala2.12-java11-ubuntu/Dockerfile +++ b/3.4.0/scala2.12-java11-ubuntu/Dockerfile @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} 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; \ + apt-get 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; \ @@ -33,7 +33,6 @@ RUN set -ex; \ 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 diff --git a/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile b/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile index 95c98b9..30e6b86 100644 --- a/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile +++ b/3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile @@ -20,9 +20,8 @@ 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/*; \ + apt-get install -y python3 python3-pip; \ + apt-get install -y r-base r-base-dev; \ rm -rf /var/lib/apt/lists/* ENV R_HOME /usr/lib/R diff --git a/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile b/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile index 8b4dcc9..124ef71 100644 --- a/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile +++ b/3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile @@ -20,8 +20,7 @@ USER root RUN set -ex; \ apt-get update; \ - apt install -y python3 python3-pip; \ - rm -rf /var/cache/apt/*; \ + apt-get install -y python3 python3-pip; \ 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 index a1dd367..1c9fc38 100644 --- a/3.4.1/scala2.12-java11-r-ubuntu/Dockerfile +++ b/3.4.1/scala2.12-java11-r-ubuntu/Dockerfile @@ -20,8 +20,7 @@ USER root RUN set -ex; \ apt-get update; \ - apt install -y r-base r-base-dev; \ - rm -rf /var/cache/apt/*; \ + apt-get install -y r-base r-base-dev; \ rm -rf /var/lib/apt/lists/* ENV R_HOME /usr/lib/R diff --git a/3.4.1/scala2.12-java11-ubuntu/Dockerfile b/3.4.1/scala2.12-java11-ubuntu/Dockerfile index 8028ce6..e782686 100644 --- a/3.4.1/scala2.12-java11-ubuntu/Dockerfile +++ b/3.4.1/scala2.12-java11-ubuntu/Dockerfile @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} 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; \ + apt-get 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; \ @@ -33,7 +33,6 @@ RUN set -ex; \ 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 diff --git a/Dockerfile.template b/Dockerfile.template index fc67534..6fedce9 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} 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; \ + apt-get 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; \ @@ -33,7 +33,6 @@ RUN set -ex; \ 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 diff --git a/r-python.template b/r-python.template index 2cc3be0..e3eb01a 100644 --- a/r-python.template +++ b/r-python.template @@ -21,12 +21,11 @@ USER root RUN set -ex; \ apt-get update; \ {%- if HAVE_PY %} - apt install -y python3 python3-pip; \ + apt-get install -y python3 python3-pip; \ {%- endif %} {%- if HAVE_R %} - apt install -y r-base r-base-dev; \ + apt-get install -y r-base r-base-dev; \ {%- endif %} - rm -rf /var/cache/apt/*; \ rm -rf /var/lib/apt/lists/* {%- if HAVE_R %}