[mnemonic] branch master updated: MNEMONIC-643: Upgrade JDK11 to JDK14 in Ubuntu dockerfile

[yz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yzhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic.git


The following commit(s) were added to refs/heads/master by this push:
     new c008d6f  MNEMONIC-643: Upgrade JDK11 to JDK14 in Ubuntu dockerfile
c008d6f is described below

commit c008d6fc60b5d49583db991292833c2b0727c206
Author: Xiaojin Jiao <xj...@apache.org>
AuthorDate: Sat Apr 24 20:02:21 2021 -0700

    MNEMONIC-643: Upgrade JDK11 to JDK14 in Ubuntu dockerfile
    
    Signed-off-by: Xiaojin Jiao <xj...@apache.org>
---
 docker/docker-Ubuntu/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/docker-Ubuntu/Dockerfile b/docker/docker-Ubuntu/Dockerfile
index 4bb7e0e..099deea 100644
--- a/docker/docker-Ubuntu/Dockerfile
+++ b/docker/docker-Ubuntu/Dockerfile
@@ -18,14 +18,14 @@
 FROM ubuntu:18.04
 MAINTAINER Yanhui Zhao (yanhui.zhao@outlook.com)
 
-RUN apt-get -y update && \
-    apt-get install -y default-jdk cmake check git pkg-config autoconf man build-essential gcc g++ uuid-dev pandoc devscripts flex doxygen maven
+RUN apt-get -y update && apt-get install -y software-properties-common && add-apt-repository ppa:openjdk-r/ppa && apt-get -y update && \
+    apt-get install -y openjdk-14-jdk cmake check git pkg-config autoconf man build-essential gcc g++ uuid-dev pandoc devscripts flex doxygen maven
 
 RUN apt-get install -y libndctl-dev libpmem-dev libvmem-dev libpmemobj-dev
 
 RUN apt-get clean
 
-ENV JAVA_HOME /usr/lib/jvm/default-java
+ENV JAVA_HOME /usr/lib/jvm/java-14-openjdk-amd64
 ENV PATH $JAVA_HOME/bin:$PATH
 
 WORKDIR /ws