diff --git a/bin/docker-image-tool.sh b/bin/docker-image-tool.sh index ad31bd1e7b7ab..037e0c70b07a7 100755 --- a/bin/docker-image-tool.sh +++ b/bin/docker-image-tool.sh @@ -269,11 +269,11 @@ Examples: $0 -r docker.io/myrepo -t v2.3.0 push - Build and push Java11-based image with tag "v3.0.0" to docker.io/myrepo - $0 -r docker.io/myrepo -t v3.0.0 -b java_image_tag=11-jre-slim build + $0 -r docker.io/myrepo -t v3.0.0 -b java_image_tag=11-jre-focal build $0 -r docker.io/myrepo -t v3.0.0 push - Build and push Java11-based image for multiple archs to docker.io/myrepo - $0 -r docker.io/myrepo -t v3.0.0 -X -b java_image_tag=11-jre-slim build + $0 -r docker.io/myrepo -t v3.0.0 -X -b java_image_tag=11-jre-focal build # Note: buildx, which does cross building, needs to do the push during build # So there is no separate push step with -X diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile index 9f4e2462f3c00..fc529afb1be82 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ARG java_image_tag=11-jre-slim +ARG java_image_tag=11-jre-focal -FROM openjdk:${java_image_tag} +FROM eclipse-temurin:${java_image_tag} ARG spark_uid=185 @@ -28,7 +28,6 @@ ARG spark_uid=185 # docker build -t spark:latest -f kubernetes/dockerfiles/spark/Dockerfile . RUN set -ex && \ - sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \ apt-get update && \ ln -s /lib /lib64 && \ apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools && \ diff --git a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh index d8960349f0080..721a60b0aef41 100755 --- a/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh +++ b/resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh @@ -103,7 +103,7 @@ then cd $SPARK_INPUT_DIR if [[ $DOCKER_FILE == "N/A" ]]; then - # OpenJDK base-image tag (e.g. 8-jre-slim, 11-jre-slim) + # OpenJDK base-image tag (e.g. 8-jre-focal, 11-jre-focal) JAVA_IMAGE_TAG_BUILD_ARG="-b java_image_tag=$JAVA_IMAGE_TAG" else if [[ $DOCKER_FILE = /* ]]; then