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 995483a Refactor the deployment of Maven in CentOS Dockerfile
995483a is described below
commit 995483ad096aa1d33db19b07f9f6ef4149d29bf2
Author: Gary <[email protected]>
AuthorDate: Sat Aug 1 18:44:10 2020 -0700
Refactor the deployment of Maven in CentOS Dockerfile
This patch replaces the manually installation of Maven with yum install
maven,
becaues the version of Maven of CentOS 8 is already v3.5.4.
The proxy settings for Maven also been removed to simplify the
configuration.
Fixes #135
---
docker/docker-CentOS/Dockerfile | 36 +++++++-----------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
diff --git a/docker/docker-CentOS/Dockerfile b/docker/docker-CentOS/Dockerfile
index efcc4fa..85b8a1f 100644
--- a/docker/docker-CentOS/Dockerfile
+++ b/docker/docker-CentOS/Dockerfile
@@ -18,49 +18,27 @@
FROM centos:8
MAINTAINER Gang Wang ([email protected])
-#set up your proxy below, please refer to readme in the Docker folder
-ARG proxy_host=""
-ARG proxy_port=""
-ENV http_proxy ${proxy_host:+"http://${proxy_host}:${proxy_port}"}
-ENV https_proxy ${http_proxy}
-ENV HTTP_PROXY ${http_proxy}
-ENV HTTPS_PROXY ${http_proxy}
-
-RUN echo The proxy set : ${http_proxy}
-
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 && yum clean all
+ yum -y install java-devel cmake check check-devel libuuid-devel man
zlib-devel maven
-RUN mkdir -p /ws
+RUN yum -y install ndctl-devel libpmem-devel libvmem-devel libpmemobj-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 && \
- mv apache-maven-3.5.4 /usr/local/apache-maven
+RUN yum clean all
-ENV M2_HOME /usr/local/apache-maven
-ENV M2 $M2_HOME/bin
-ENV PATH $M2:$PATH
ENV JAVA_HOME /usr/lib/jvm/java
ENV PATH $JAVA_HOME/bin:$PATH
-RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git &&
\
- cd pmalloc && mkdir build && cd build && cmake .. && make && make install
-
-RUN yum -y install ndctl-devel libpmem-devel libvmem-devel libpmemobj-devel
-
-RUN touch /etc/profile.d/mvn.sh && chmod +x /etc/profile.d/mvn.sh && \
- if [ "x" != "x${proxy_host}" ]; then echo export MAVEN_OPTS="\"
-DproxySet=\\\"true\\\" -DproxyHost=${proxy_host} -DproxyPort=${proxy_port} \""
> /etc/profile.d/mvn.sh; fi
+WORKDIR /ws
-RUN cat /etc/profile.d/mvn.sh > ~/.bash_profile
-RUN cat /etc/profile.d/mvn.sh > ~/.bashrc
+RUN git clone https://github.com/NonVolatileComputing/pmalloc.git && \
+ cd pmalloc && mkdir build && cd build && cmake .. && make && make install
-RUN . /etc/profile.d/mvn.sh && cd /ws && git clone
https://github.com/apache/mnemonic.git && \
+RUN git clone https://github.com/apache/mnemonic.git && \
cd mnemonic && mvn clean package install
ENV MNEMONIC_HOME /ws/mnemonic
#RUN cd /ws/mnemonic && bin/runall.sh -y
-WORKDIR /ws
CMD ["bash"]
