You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/27 02:50:00 UTC

[incubator-iotdb] branch cherry_pick_rel0.8 created (now 50f935a)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at 50f935a  Update dockerfile to only compile server and client

This branch includes the following new commits:

     new 6a68a5b  Added a note on spark-tsfile documentation to indicate the potential incompatiblity between openjdk and scala
     new 50f935a  Update dockerfile to only compile server and client

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-iotdb] 01/02: Added a note on spark-tsfile documentation to indicate the potential incompatiblity between openjdk and scala

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 6a68a5b7dab49d450cf0e9ce9719f9fb18a55ec4
Author: Zihan Meng <40...@users.noreply.github.com>
AuthorDate: Fri Jul 26 17:37:23 2019 +0800

    Added a note on spark-tsfile documentation to indicate the potential incompatiblity between openjdk and scala
---
 spark-tsfile/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spark-tsfile/README.md b/spark-tsfile/README.md
index 1d50a05..20dd757 100644
--- a/spark-tsfile/README.md
+++ b/spark-tsfile/README.md
@@ -65,6 +65,8 @@ With this connector, you can
 
 > Note: For more information about how to download and use TsFile, please see the following link: https://github.com/apache/incubator-iotdb/tree/master/tsfile.
 
+> Note: Openjdk may not be competible with scala. Use oracle jdk instead.
+
 <a id="3-quick-start"></a>
 ## 3. Quick Start
 <a id="local-mode"></a>


[incubator-iotdb] 02/02: Update dockerfile to only compile server and client

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch cherry_pick_rel0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 50f935ac1adb1b85181d8aa19df107ea79846881
Author: 151250128 <15...@smail.nju.edu.cn>
AuthorDate: Fri Jul 26 17:59:12 2019 +0800

    Update dockerfile to only compile server and client
---
 docker/Dockerfile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 507e2b7..b3cf982 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,17 +25,20 @@ RUN apt update \
   && rm -rf jdk11.tar.gz \
   && export JAVA_HOME=/jdk-11.0.2/ \
   && export PATH="$JAVA_HOME/bin:$PATH" \
-  && wget https://github.com/apache/incubator-iotdb/archive/master.zip \
-  && unzip master.zip \
-  && rm master.zip \
-  && cd incubator-iotdb-master \
-  && mvn package -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
-  && cp -r iotdb/iotdb /iotdb \
-  && cp -r iotdb-cli/cli /cli \
+  && wget https://github.com/apache/incubator-iotdb/archive/rel/0.8.zip \
+  && unzip 0.8.zip \
+  && rm 0.8.zip \
+  && cd incubator-iotdb-rel-0.8 \
+  && mvn package -pl server,client -am -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
+  && cd build/target/ \
+  && tar -xzf build-0.8.0-SNAPSHOT-release.tar.gz \
+  && mkdir /iotdb \
+  && mv build-0.8.0-SNAPSHOT/* /iotdb/ \
+  && cd ../../ \
   && mvn clean \
   && ls -lh ~/.m2 \
   && rm -rf ~/.m2 \
-  && rm -rf /incubator-iotdb-master \
+  && rm -rf /incubator-iotdb-rel-0.8 \
   && sed -i '119d' /iotdb/conf/logback.xml \
   && apt remove wget maven unzip thrift-compiler -y \
   && apt autoremove -y \