You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2021/03/11 12:56:57 UTC
[hadoop] branch branch-2.10 updated: HADOOP-17572. [branch-2.10]
Docker image build fails due to the removal of openjdk-7-jdk package
(#2755)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 8bd58c7 HADOOP-17572. [branch-2.10] Docker image build fails due to the removal of openjdk-7-jdk package (#2755)
8bd58c7 is described below
commit 8bd58c739194884064ab87d2022dce8cb1328e3a
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Thu Mar 11 21:56:19 2021 +0900
HADOOP-17572. [branch-2.10] Docker image build fails due to the removal of openjdk-7-jdk package (#2755)
Reviewed-by: Steve Loughran <st...@apache.org>
---
dev-support/Jenkinsfile | 5 +++++
dev-support/docker/Dockerfile | 9 ++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index a89fb48..ce861a3 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -156,6 +156,11 @@ pipeline {
# use emoji vote so it is easier to find the broken line
YETUS_ARGS+=("--github-use-emoji-vote")
+ # Use both Java 7 and 8
+ YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-8-openjdk-amd64")
+ YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/zulu-7-amd64")
+ YETUS_ARGS+=("--multijdktests=compile")
+
"${TESTPATCHBIN}" "${YETUS_ARGS[@]}"
'''
}
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f7f9315..10dd45e 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -93,13 +93,12 @@ RUN apt-get -q update \
#######
# OpenJDK 7
#######
-# hadolint ignore=DL3008
-RUN add-apt-repository ppa:openjdk-r/ppa
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends openjdk-7-jdk \
+RUN curl -L -s -S https://cdn.azul.com/zulu/bin/zulu7.38.0.11-ca-jdk7.0.262-linux_amd64.deb \
+ -o /opt/jdk7.deb \
+ && apt-get -q install -y --no-install-recommends /opt/jdk7.deb \
+ && rm -rf /opt/jdk7.deb \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
-RUN update-java-alternatives --set java-1.7.0-openjdk-amd64
######
# Install cmake 3.1.0 (3.5.1 ships with Xenial)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org