Ver código fonte

HADOOP-17572. [branch-2.10] Docker image build fails due to the removal of openjdk-7-jdk package (#2755)

Reviewed-by: Steve Loughran <stevel@apache.org>
Akira Ajisaka 4 anos atrás
pai
commit
8bd58c7391
2 arquivos alterados com 9 adições e 5 exclusões
  1. 5 0
      dev-support/Jenkinsfile
  2. 4 5
      dev-support/docker/Dockerfile

+ 5 - 0
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[@]}"
                         '''
                 }

+ 4 - 5
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)