Repository: zeppelin Updated Branches: refs/heads/branch-0.7 5c8d7902a -> 742994f81
[ZEPPELIN-2861] Use OpenJDK in docker image. ### What is this PR for? Using OpenJDK at distributing docker image will reduce legal threats. ### What type of PR is it? Bug Fix ### Todos ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2861 ### How should this be tested? `docker build scripts/docker/zeppelin/bin` ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? **NO** * Is there breaking changes for older versions? **NO** * Does this needs documentation? **NO** Author: Jinkyu Yi <[email protected]> Closes #2536 from jincreator/ZEPPELIN-2861 and squashes the following commits: 3b4fbcb [Jinkyu Yi] [ZEPPELIN-2861] Use OpenJDK in docker image. (cherry picked from commit cbdaf22a92d6ddded017aae2bc4ee5409d308f01) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/742994f8 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/742994f8 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/742994f8 Branch: refs/heads/branch-0.7 Commit: 742994f819c7b14336615e82a3f8e5e852bbd5cc Parents: 5c8d790 Author: Jinkyu Yi <[email protected]> Authored: Tue Aug 15 16:52:42 2017 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Aug 17 14:02:41 2017 -0700 ---------------------------------------------------------------------- scripts/docker/zeppelin/bin/Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/742994f8/scripts/docker/zeppelin/bin/Dockerfile ---------------------------------------------------------------------- diff --git a/scripts/docker/zeppelin/bin/Dockerfile b/scripts/docker/zeppelin/bin/Dockerfile index fc35091..e467ba2 100644 --- a/scripts/docker/zeppelin/bin/Dockerfile +++ b/scripts/docker/zeppelin/bin/Dockerfile @@ -39,14 +39,11 @@ RUN echo "$LOG_TAG install tini related packages" && \ dpkg -i tini.deb && \ rm tini.deb -ENV JAVA_HOME=/usr/lib/jvm/java-8-oracle +ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 RUN echo "$LOG_TAG Install java8" && \ - echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ - add-apt-repository -y ppa:webupd8team/java && \ apt-get -y update && \ - apt-get install -y oracle-java8-installer && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /var/cache/oracle-jdk8-installer + apt-get install -y openjdk-8-jdk && \ + rm -rf /var/lib/apt/lists/* # should install conda first before numpy, matploylib since pip and python will be installed by conda RUN echo "$LOG_TAG Install miniconda2 related packages" && \
