[mnemonic] branch master updated: MNEMONIC-531: Upgrade PMDK to ver. stable 1.6 in Ubuntu Dockerfile

[garyw]

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

garyw 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 f09f00c  MNEMONIC-531: Upgrade PMDK to ver. stable 1.6 in Ubuntu 
Dockerfile
f09f00c is described below

commit f09f00cd0929b69e6ed09fdbb8f7f4c93c41c20e
Author: Wang, Gang(Gary) <ga...@apache.org>
AuthorDate: Mon Aug 5 01:04:42 2019 -0700

    MNEMONIC-531: Upgrade PMDK to ver. stable 1.6 in Ubuntu Dockerfile
---
 docker/docker-Ubuntu/Dockerfile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docker/docker-Ubuntu/Dockerfile b/docker/docker-Ubuntu/Dockerfile
index 9d74a71..22f63ed 100644
--- a/docker/docker-Ubuntu/Dockerfile
+++ b/docker/docker-Ubuntu/Dockerfile
@@ -28,11 +28,11 @@ ENV HTTPS_PROXY ${http_proxy}
 
 RUN echo The proxy set : ${http_proxy}
 
-RUN apt-get -y update && \
+RUN apt-get -y update && apt-get -y upgrade && \
     apt-get install -y default-jdk cmake check git pkg-config autoconf man 
build-essential gcc g++ uuid-dev pandoc devscripts flex doxygen
 
 # required packages by pmdk
-RUN apt install -y autoconf asciidoc xmlto automake libtool libkmod-dev 
libudev-dev uuid-dev libjson-c-dev
+RUN apt install -y autoconf asciidoc xmlto automake libtool libkmod-dev 
libudev-dev uuid-dev libjson-c-dev asciidoctor bash-completion graphviz 
libkeyutils-dev
 
 RUN apt-get clean
 
@@ -48,21 +48,20 @@ ENV PATH $JAVA_HOME/bin:$PATH
 
 RUN mkdir -p /ws
 RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && 
\
-    cd pmalloc && mkdir build && cd build && cmake .. && make && make install 
-    
+    cd pmalloc && mkdir build && cd build && cmake .. && make && make install
+
 RUN cd /ws && git clone https://github.com/pmem/nvml.git && \
     cd nvml && git checkout 630862e82f && make && make install
 
-
 # deploy ndctl required by pmdk
 RUN cd /ws && git clone https://github.com/pmem/ndctl.git && \
-    cd ndctl && git checkout ndctl-60.y && \
+    cd ndctl && git checkout ndctl-64.y && \
     ./autogen.sh && ./configure CFLAGS='-g -O0' --prefix=/usr 
--sysconfdir=/etc --libdir=/usr/lib && \
     make && make check && make install
 
 # deploy pmdk
 RUN cd /ws && git clone https://github.com/pmem/pmdk.git && \
-    cd pmdk && git checkout stable-1.4 && make && \
+    cd pmdk && git checkout stable-1.6 && make && \
 #    the test run time is too long
 #    cp src/test/testconfig.sh.example src/test/testconfig.sh && make check && 
\
     make install
@@ -84,4 +83,3 @@ ENV MNEMONIC_HOME /ws/mnemonic
 WORKDIR /ws
 
 CMD ["bash"]
-