remove changes in 3.3.0, fix tests

apache · Oct 17, 2023 · 95bece2 · 95bece2
1 parent 922b53e
commit 95bece2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -247,6 +247,7 @@ jobs:
           # TODO(SPARK-44495): Resume to use the latest minikube for k8s-integration-tests.
           curl -LO https://storage.googleapis.com/minikube/releases/v1.30.1/minikube-linux-amd64
           sudo install minikube-linux-amd64 /usr/local/bin/minikube
+          rm minikube-linux-amd64
           # Github Action limit cpu:2, memory: 6947MB, limit to 2U6G for better resource statistic
           minikube start --cpus 2 --memory 6144
 

diff --git a/3.3.0/scala2.12-java11-python3-r-ubuntu/Dockerfile b/3.3.0/scala2.12-java11-python3-r-ubuntu/Dockerfile
@@ -24,9 +24,9 @@ RUN groupadd --system --gid=${spark_uid} spark && \
 RUN set -ex && \
     apt-get update && \
     ln -s /lib /lib64 && \
-    apt-get install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu && \
-    apt-get install -y python3 python3-pip && \
-    apt-get install -y r-base r-base-dev && \
+    apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu && \
+    apt install -y python3 python3-pip && \
+    apt install -y r-base r-base-dev && \
     mkdir -p /opt/spark && \
     mkdir /opt/spark/python && \
     mkdir -p /opt/spark/examples && \

diff --git a/3.3.0/scala2.12-java11-python3-ubuntu/Dockerfile b/3.3.0/scala2.12-java11-python3-ubuntu/Dockerfile
@@ -24,8 +24,8 @@ RUN groupadd --system --gid=${spark_uid} spark && \
 RUN set -ex && \
     apt-get update && \
     ln -s /lib /lib64 && \
-    apt-get install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu && \
-    apt-get install -y python3 python3-pip && \
+    apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu && \
+    apt install -y python3 python3-pip && \
     mkdir -p /opt/spark && \
     mkdir /opt/spark/python && \
     mkdir -p /opt/spark/examples && \