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 f8e7a7f MNEMONIC-532: Upgrade PMDK to ver. stable 1.6 in CentOS
Dockerfile
f8e7a7f is described below
commit f8e7a7f828c1e8f91ae464f56a7137d73bfcd702
Author: Wang, Gang(Gary) <[email protected]>
AuthorDate: Sun Aug 11 22:46:54 2019 -0700
MNEMONIC-532: Upgrade PMDK to ver. stable 1.6 in CentOS Dockerfile
---
docker/docker-CentOS/Dockerfile | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/docker/docker-CentOS/Dockerfile b/docker/docker-CentOS/Dockerfile
index eecf670..2b51489 100644
--- a/docker/docker-CentOS/Dockerfile
+++ b/docker/docker-CentOS/Dockerfile
@@ -30,11 +30,13 @@ RUN echo The proxy set : ${http_proxy}
RUN curl -sSL
https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo | tee
/etc/yum.repos.d/fpco.repo
+RUN yum -y install epel-release
RUN yum -y update && yum -y groupinstall 'Development Tools' && \
yum -y install java-devel cmake check check-devel libuuid-devel man
zlib-devel wget stack && yum clean all
# required packages by pmdk
-RUN yum install -y which autoconf asciidoc xmlto automake libtool kmod-devel
libudev-devel uuid-devel json-c-devel
+RUN yum install -y which autoconf asciidoc xmlto automake libtool kmod-devel
libudev-devel uuid-devel json-c-devel \
+ asciidoc asciidoc-doc bash-completion graphviz
keyutils-libs-devel asciidoctor ndctl ndctl-devel daxctl daxctl-devel
RUN curl -O
http://mirror.cogentco.com/pub/apache/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
&& \
tar xvf apache-maven-3.5.4-bin.tar.gz && \
@@ -62,14 +64,14 @@ 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 && \
- ./autogen.sh && ./configure CFLAGS='-g -O0' --prefix=/usr
--sysconfdir=/etc --libdir=/usr/lib && \
- make && make check && make install
+#RUN cd /ws && git clone https://github.com/pmem/ndctl.git && \
+# 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
@@ -89,4 +91,3 @@ ENV MNEMONIC_HOME /ws/mnemonic
WORKDIR /ws
CMD ["bash"]
-
