mnemonic-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [2/2] incubator-mnemonic git commit: MNEMONIC-267: Upgrade the Dockerfile to use ARG feature
Date Tue, 16 May 2017 21:16:30 GMT
MNEMONIC-267: Upgrade the Dockerfile to use ARG feature


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

Branch: refs/heads/master
Commit: 83cac444301e5d34b3f298a76101ae87651238b4
Parents: fc7ecef
Author: Wang, Gang(Gary) <gang1.wang@intel.com>
Authored: Tue May 16 10:00:23 2017 -0700
Committer: Wang, Gang(Gary) <gang1.wang@intel.com>
Committed: Tue May 16 12:04:52 2017 -0700

----------------------------------------------------------------------
 docker/Dockerfile |  19 +++++++++----------
 docker/README.md  | Bin 1923 -> 2059 bytes
 2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/83cac444/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0d0e8d3..fb9004e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,16 +18,15 @@
 FROM centos:latest
 MAINTAINER Gang Wang (garyw@apache.org)
 
-#set up your proxy below, refer to readme in the Docker folder
-ENV proxy_host ""
-ENV proxy_port ""
-#ENV http_proxy "http://${proxy_host}:${proxy_port}"
-#ENV https_proxy ${http_proxy}
-#ENV HTTP_PROXY ${http_proxy}
-#ENV HTTPS_PROXY ${http_proxy}
-#ENV proxy ${http_proxy}
-
-RUN echo $proxy
+#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 curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo | tee /etc/yum.repos.d/fpco.repo
 

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/83cac444/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
index b35c2b9..d41867e 100644
Binary files a/docker/README.md and b/docker/README.md differ


Mime
View raw message