Adaptive yinglong image (apache#598)

Co-authored-by: luoping.zhang <[email protected]>

Author: 2 people

bin/docker-image-tool.sh

@@ -107,7 +107,7 @@ function create_dev_build_context {(
     fi
   done
 
-  for other in bin sbin data; do
+  for other in bin sbin data hive_1_2_2; do
     cp -r "$other" "$BASE_CTX/$other"
   done
 

resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile

@@ -28,6 +28,7 @@ ARG spark_uid=root
 # docker build -t spark:latest -f kubernetes/dockerfiles/spark/Dockerfile .
 
 RUN set -ex && \
+    cat /etc/resolv.conf && \
     sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \
     apt-get update && \
     ln -s /lib /lib64 && \
@@ -50,6 +51,7 @@ COPY kubernetes/dockerfiles/spark/decom.sh /opt/
 COPY examples /opt/spark/examples
 COPY kubernetes/tests /opt/spark/tests
 COPY data /opt/spark/data
+COPY hive_1_2_2 /opt/spark/hive_1_2_2
 
 ENV SPARK_HOME /opt/spark
 

resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile.java17

@@ -28,6 +28,7 @@ ARG spark_uid=185
 # docker build -t spark:latest -f kubernetes/dockerfiles/spark/Dockerfile .
 
 RUN set -ex && \
+    cat /etc/resolv.conf && \
     apt-get update && \
     ln -s /lib /lib64 && \
     apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps openjdk-17-jre && \
@@ -49,6 +50,7 @@ COPY kubernetes/dockerfiles/spark/decom.sh /opt/
 COPY examples /opt/spark/examples
 COPY kubernetes/tests /opt/spark/tests
 COPY data /opt/spark/data
+COPY hive_1_2_2 /opt/spark/hive_1_2_2
 
 ENV SPARK_HOME /opt/spark