You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2017/05/16 21:16:29 UTC
[1/2] incubator-mnemonic git commit: MNEMONIC-266: Upgrade Spark
artifacts to v2.1.1
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master a18b0a644 -> 83cac4443
MNEMONIC-266: Upgrade Spark artifacts to v2.1.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/fc7ecefc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/fc7ecefc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/fc7ecefc
Branch: refs/heads/master
Commit: fc7ecefc67787988d5e8febee668b88ca0600eaa
Parents: a18b0a6
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri May 12 17:17:18 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri May 12 17:17:18 2017 -0700
----------------------------------------------------------------------
mnemonic-spark/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fc7ecefc/mnemonic-spark/pom.xml
----------------------------------------------------------------------
diff --git a/mnemonic-spark/pom.xml b/mnemonic-spark/pom.xml
index 8a233a5..0f68f85 100644
--- a/mnemonic-spark/pom.xml
+++ b/mnemonic-spark/pom.xml
@@ -35,7 +35,7 @@
<url>http://mnemonic.incubator.apache.org</url>
<properties>
- <spark.version>2.1.0</spark.version>
+ <spark.version>2.1.1</spark.version>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<scalatest.version>3.0.1</scalatest.version>
[2/2] incubator-mnemonic git commit: MNEMONIC-267: Upgrade the
Dockerfile to use ARG feature
Posted by ga...@apache.org.
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) <ga...@intel.com>
Authored: Tue May 16 10:00:23 2017 -0700
Committer: Wang, Gang(Gary) <ga...@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