mnemonic-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject incubator-mnemonic git commit: MNEMONIC-386: Improve the CentOS Dockerfile for http proxy mode
Date Thu, 12 Oct 2017 05:33:36 GMT
Repository: incubator-mnemonic
Updated Branches:
  refs/heads/master 68edd0815 -> 4f5be4290


MNEMONIC-386: Improve the CentOS Dockerfile for http proxy mode


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/4f5be429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/4f5be429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/4f5be429

Branch: refs/heads/master
Commit: 4f5be4290d148bf52a21a7f11fbba2c66caf64ac
Parents: 68edd08
Author: Wang, Gang(Gary) <gang1.wang@intel.com>
Authored: Wed Oct 11 22:32:08 2017 -0700
Committer: Wang, Gang(Gary) <gang1.wang@intel.com>
Committed: Wed Oct 11 22:32:08 2017 -0700

----------------------------------------------------------------------
 docker/docker-CentOS/Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/4f5be429/docker/docker-CentOS/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/docker-CentOS/Dockerfile b/docker/docker-CentOS/Dockerfile
index 0cd3c70..ec3e5e3 100644
--- a/docker/docker-CentOS/Dockerfile
+++ b/docker/docker-CentOS/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM centos:7
+FROM centos:7.4.1708
 MAINTAINER Gang Wang (garyw@apache.org)
 
 #set up your proxy below, please refer to readme in the Docker folder
@@ -58,10 +58,14 @@ RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git
&& \
 RUN cd /ws && git clone https://github.com/pmem/nvml.git && \
     cd nvml && git checkout 630862e82f && make && make install
 
-RUN echo export MAVEN_OPTS="\" $([[ \"x\" != \"x${proxy_host}\" ]] && echo -DproxySet=\\\"true\\\"
-DproxyHost=${proxy_host} -DproxyPort=${proxy_port}) \"" \
-    > /etc/profile.d/mvn.sh && chmod +x /etc/profile.d/mvn.sh
-RUN cd /ws && git clone https://github.com/apache/incubator-mnemonic.git &&
\
-    cd incubator-mnemonic && source /etc/profile.d/mvn.sh && mvn clean package
install
+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
+
+RUN cat /etc/profile.d/mvn.sh > ~/.bash_profile
+RUN cat /etc/profile.d/mvn.sh > ~/.bashrc
+
+RUN . /etc/profile.d/mvn.sh && cd /ws && git clone https://github.com/apache/incubator-mnemonic.git
&& \
+    cd incubator-mnemonic && mvn clean package install
 
 ENV MNEMONIC_HOME /ws/incubator-mnemonic
 


Mime
View raw message