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/06/23 23:32:17 UTC
[1/2] incubator-mnemonic git commit: MNEMONIC-278 re-structure the
folders of docker
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master 06e2e95f3 -> fd0ef673e
MNEMONIC-278 re-structure the folders of docker
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/fd827847
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/fd827847
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/fd827847
Branch: refs/heads/master
Commit: fd827847453b49077895347c79e7de186505a8b0
Parents: 06e2e95
Author: lql5083psu <la...@gmail.com>
Authored: Sun Jun 11 17:41:49 2017 -0700
Committer: lql5083psu <la...@gmail.com>
Committed: Wed Jun 14 22:33:07 2017 -0700
----------------------------------------------------------------------
build-tools/source-assembly.xml | 1 +
docker-ubuntu/Dockerfile | 64 ------------------------------
docker-ubuntu/README.md | 75 ------------------------------------
docker/Dockerfile | 72 ----------------------------------
docker/README.md | 26 ++++++-------
docker/docker-CentOS/Dockerfile | 72 ++++++++++++++++++++++++++++++++++
docker/docker-Ubuntu/Dockerfile | 64 ++++++++++++++++++++++++++++++
7 files changed, 150 insertions(+), 224 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/build-tools/source-assembly.xml
----------------------------------------------------------------------
diff --git a/build-tools/source-assembly.xml b/build-tools/source-assembly.xml
index 276e975..d8331fd 100644
--- a/build-tools/source-assembly.xml
+++ b/build-tools/source-assembly.xml
@@ -271,6 +271,7 @@
<include>KEYS</include>
<include>pom.xml</include>
<include>build-tools/**</include>
+ <include>docker/**</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker-ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/docker-ubuntu/Dockerfile b/docker-ubuntu/Dockerfile
deleted file mode 100644
index 476ff8b..0000000
--- a/docker-ubuntu/Dockerfile
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FROM ubuntu:16.04
-MAINTAINER Yanhui Zhao (yanhui.zhao@outlook.com)
-
-#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 apt-get -y update && \
- apt-get install -y default-jdk cmake check git maven pkg-config autoconf man build-essential gcc g++ uuid-dev pandoc devscripts flex doxygen
-
-RUN apt-get clean
-
-ENV M2_HOME /usr/share/maven
-ENV M2 $M2_HOME/bin
-ENV PATH $M2:$PATH
-ENV JAVA_HOME /usr/lib/jvm/default-java
-ENV PATH $JAVA_HOME/bin:$PATH
-
-RUN mkdir -p /ws
-RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
- cd pmalloc && mkdir build && cd build && cmake .. && make && make install
-
-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 /bin/bash -c "source /etc/profile.d/mvn.sh"
-
-RUN cd /ws && git clone https://github.com/apache/incubator-mnemonic.git && \
- cd incubator-mnemonic && mvn clean package install
-
-ENV MNEMONIC_HOME /ws/incubator-mnemonic
-
-#RUN cd /ws/incubator-mnemonic && build-tools/runall.sh -y
-
-WORKDIR /ws
-
-CMD ["bash"]
-
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker-ubuntu/README.md
----------------------------------------------------------------------
diff --git a/docker-ubuntu/README.md b/docker-ubuntu/README.md
deleted file mode 100644
index 811c61d..0000000
--- a/docker-ubuntu/README.md
+++ /dev/null
@@ -1,75 +0,0 @@
-<img src="http://nonvolatilecomputing.github.io/Mnemonic/images/mnemonic_logo.png" width=200 />
-
-================================
-
-This is the "Dockerfile" that will automatically build the environment of this project under ubuntu.
-
---------------
-### Features:
-
-*What does this Dockerfile do?*
-
-- 1. Build from ubuntu 16.04.
-- 2. Default is not using proxy. Please see instruction below to set up http/https proxy.
-- 3. Install dependency packages.
-- 4. Set up environment variables of paths.
-- 5. Create /ws folder.
-- 6. Install pmalloc in /ws
-- 7. Install nvml in /ws.
-- 8. Set up maven proxy mvn.sh.
-- 9. Clone mnemonic code then build/install.
-- 10. Go to /ws fold and start bash.
-
-#### How to set up proxy?
-
-Set the argument "http_proxy" for the docker option "--build-arg" as follows
-```bash
- $ docker build -t NAME[:TAG] --build-arg proxy_host="<proxy_host>" proxy_port="<proxy_port>" .
-```
-
-For old version docker v1.10 below, Please replace ARG with ENV and set its value as proxy strings in Dockerfile instead
-
-### How to build the docker image from Dockerfile in host OS?
-Build from git repository
-
-```bash
- $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker-ubuntu
-```
-
--- OR --
-
-In the folder of Dockerfile, run:
-
-```bash
- $ docker build -t NAME[:TAG] .
-```
-
-* More detials please refer to [Docker build reference](https://docs.docker.com/engine/reference/commandline/build/)
-
-#### Optional: After build, push image to dockerhub:
-
-```bash
- $ docker login [OPTIONS] [SERVER]
- $ docker push [OPTIONS] NAME[:TAG]
-```
-
-* More detials please refer to [Docker login reference](https://docs.docker.com/engine/reference/commandline/login/)
- and [Docker push reference](https://docs.docker.com/engine/reference/commandline/push/)
-
-### How to run image after build
-
-Run image:
-
-```bash
- $ docker run --name CONTAINER_NAME -it NAME[:TAG]
-```
-
-### Sharing host project folder to Dock container for IDEs e.g. Eclipse, Intellij IDEA
-
-```bash
- $ docker run -v <hostdir>/incubator-mnemonic:/ws/incubator-mnemonic -it NAME[:TAG]
-```
-Note: this command will override the container's project folder, you can use another name to avoid it.
-
- * More details please refer to [Docker run reference](https://docs.docker.com/engine/reference/run/)
-
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index fb9004e..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FROM centos:latest
-MAINTAINER Gang Wang (garyw@apache.org)
-
-#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
-
-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
-
-RUN curl -O http://apache.mirrors.ionfish.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz && \
- tar xvf apache-maven-3.3.9-bin.tar.gz && \
- mv apache-maven-3.3.9 /usr/local/apache-maven
-
-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 mkdir -p /ws && cd /ws && wget https://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz && \
- tar xvzf pandoc-1.17.0.3.tar.gz && \
- mv pandoc-1.17.0.3 pandoc && \
- rm pandoc-1.17.0.3.tar.gz
-
-RUN cd /ws/pandoc && stack setup && stack install
-ENV PD_HOME /ws/pandoc/.stack-work/install/x86_64-linux/lts-5.8/7.10.3/bin
-ENV PATH $PD_HOME:$PATH
-
-RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
- cd pmalloc && mkdir build && cd build && cmake .. && make && make install
-
-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
-
-ENV MNEMONIC_HOME /ws/incubator-mnemonic
-
-#RUN cd /ws/incubator-mnemonic && build-tools/runall.sh -y
-
-WORKDIR /ws
-CMD ["bash"]
-
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
index 7e13966..bd1e795 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,24 +2,23 @@
================================
-This is the "Dockerfile" that will automatically build the environment of this project.
+This is the "Dockerfile" that will automatically build the CentOS/Ubuntu environment of this project.
--------------
### Features:
-*What does this Dockerfile do?*
+*What does the Dockerfile do?*
-- 1. Build from centos.
+- 1. Build from centos/ubuntu.
- 2. Default is not using proxy. Please see instruction below to set up http/https proxy.
-- 3. Install yum default "Development Tools".
-- 4. Install maven.
-- 5. Set up environment variables of paths.
-- 6. Create /ws folder and install nvml dependency pandoc in /ws/pandoc.
-- 7. Install pmalloc in /ws
-- 8. Install nvml in /ws.
-- 9. Set up maven proxy mvn.sh.
-- 10. Clone mnemonic code then build/install.
-- 11. Go to /ws fold and start bash.
+- 3. Install dependency packages.
+- 4. Set up environment variables of paths.
+- 5. Create /ws folder.
+- 6. Install pmalloc in /ws
+- 7. Install nvml in /ws.
+- 8. Set up maven proxy mvn.sh.
+- 9. Clone mnemonic code then build/install.
+- 10. Go to /ws fold and start bash.
#### How to set up proxy?
@@ -34,7 +33,8 @@ For old version docker v1.10 below, Please replace ARG with ENV and set its valu
Build from git repository
```bash
- $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker
+ $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker/docker-CentOS
+ $ docker build -t NAME[:TAG] https://github.com/apache/incubator-mnemonic.git#:docker/docker-Ubuntu
```
-- OR --
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker/docker-CentOS/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/docker-CentOS/Dockerfile b/docker/docker-CentOS/Dockerfile
new file mode 100644
index 0000000..fb9004e
--- /dev/null
+++ b/docker/docker-CentOS/Dockerfile
@@ -0,0 +1,72 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM centos:latest
+MAINTAINER Gang Wang (garyw@apache.org)
+
+#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
+
+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
+
+RUN curl -O http://apache.mirrors.ionfish.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz && \
+ tar xvf apache-maven-3.3.9-bin.tar.gz && \
+ mv apache-maven-3.3.9 /usr/local/apache-maven
+
+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 mkdir -p /ws && cd /ws && wget https://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz && \
+ tar xvzf pandoc-1.17.0.3.tar.gz && \
+ mv pandoc-1.17.0.3 pandoc && \
+ rm pandoc-1.17.0.3.tar.gz
+
+RUN cd /ws/pandoc && stack setup && stack install
+ENV PD_HOME /ws/pandoc/.stack-work/install/x86_64-linux/lts-5.8/7.10.3/bin
+ENV PATH $PD_HOME:$PATH
+
+RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
+ cd pmalloc && mkdir build && cd build && cmake .. && make && make install
+
+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
+
+ENV MNEMONIC_HOME /ws/incubator-mnemonic
+
+#RUN cd /ws/incubator-mnemonic && build-tools/runall.sh -y
+
+WORKDIR /ws
+CMD ["bash"]
+
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd827847/docker/docker-Ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/docker-Ubuntu/Dockerfile b/docker/docker-Ubuntu/Dockerfile
new file mode 100644
index 0000000..476ff8b
--- /dev/null
+++ b/docker/docker-Ubuntu/Dockerfile
@@ -0,0 +1,64 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM ubuntu:16.04
+MAINTAINER Yanhui Zhao (yanhui.zhao@outlook.com)
+
+#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 apt-get -y update && \
+ apt-get install -y default-jdk cmake check git maven pkg-config autoconf man build-essential gcc g++ uuid-dev pandoc devscripts flex doxygen
+
+RUN apt-get clean
+
+ENV M2_HOME /usr/share/maven
+ENV M2 $M2_HOME/bin
+ENV PATH $M2:$PATH
+ENV JAVA_HOME /usr/lib/jvm/default-java
+ENV PATH $JAVA_HOME/bin:$PATH
+
+RUN mkdir -p /ws
+RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
+ cd pmalloc && mkdir build && cd build && cmake .. && make && make install
+
+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 /bin/bash -c "source /etc/profile.d/mvn.sh"
+
+RUN cd /ws && git clone https://github.com/apache/incubator-mnemonic.git && \
+ cd incubator-mnemonic && mvn clean package install
+
+ENV MNEMONIC_HOME /ws/incubator-mnemonic
+
+#RUN cd /ws/incubator-mnemonic && build-tools/runall.sh -y
+
+WORKDIR /ws
+
+CMD ["bash"]
+
[2/2] incubator-mnemonic git commit: MNEMONIC-283: Update the Logo
link
Posted by ga...@apache.org.
MNEMONIC-283: Update the Logo link
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/fd0ef673
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/fd0ef673
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/fd0ef673
Branch: refs/heads/master
Commit: fd0ef673e3ba595113d9fe410f2659edf94ceace
Parents: fd82784
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri Jun 16 10:26:15 2017 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri Jun 23 16:29:26 2017 -0700
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/fd0ef673/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 96e2ea1..52d6c11 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="http://nonvolatilecomputing.github.io/Mnemonic/images/mnemonic_logo.png" width=200 />
+<img src="https://mnemonic.incubator.apache.org/img/mnemonic_logo.png" width=200 />
================================