yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject yetus git commit: YETUS-701. take jdk9 out of default Dockerfile
Date Mon, 12 Nov 2018 03:26:39 GMT
Repository: yetus
Updated Branches:
  refs/heads/master 6ebaa1119 -> e7819fbdf


YETUS-701. take jdk9 out of default Dockerfile

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/e7819fbd
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/e7819fbd
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/e7819fbd

Branch: refs/heads/master
Commit: e7819fbdfd236778809a9c60cb0fee21eb8d5c4f
Parents: 6ebaa11
Author: Allen Wittenauer <aw@apache.org>
Authored: Sun Oct 7 13:53:54 2018 -0700
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Nov 12 12:26:20 2018 +0900

----------------------------------------------------------------------
 .../src/main/shell/test-patch-docker/Dockerfile | 28 --------------------
 1 file changed, 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/e7819fbd/precommit/src/main/shell/test-patch-docker/Dockerfile
----------------------------------------------------------------------
diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile
index 31f9f3b..413ac16 100644
--- a/precommit/src/main/shell/test-patch-docker/Dockerfile
+++ b/precommit/src/main/shell/test-patch-docker/Dockerfile
@@ -66,34 +66,6 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends
-y openjdk-8
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-#######
-# OpenJDK 9
-# w/workaround for
-# https://bugs.launchpad.net/ubuntu/+source/openjdk-9/+bug/1593191
-#######
-RUN apt-get -q update && apt-get -o Dpkg::Options::="--force-overwrite" \
-    -q install --no-install-recommends -y \
-    openjdk-9-jdk-headless \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-#######
-# Set default Java
-#######
-#
-# By default, OpenJDK sets the default Java to the highest version.
-# We want the opposite, soooooo....
-#
-RUN update-java-alternatives --set java-1.8.0-openjdk-amd64
-RUN update-alternatives --get-selections | grep -i jdk | \
-    while read -r line; do \
-      alternative=$(echo "$line" | awk '{print $1}'); \
-      path=$(echo "$line" | awk '{print $3}'); \
-      newpath=${path//java-9/java-8}; \
-      update-alternatives --set "$alternative" "$newpath"; \
-    done
-
-
 ####
 # Install ant
 ####


Mime
View raw message