You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/07/31 02:13:12 UTC
[incubator-iotdb] branch master updated (c18492c -> a3db254)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from c18492c Deleted 'SNAPSHOTS' in markdown docs
new 26f19b1 use latest binary file to build the docker image (#312)
new a3db254 change dockerfile to build from the master branch
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.
Summary of changes:
.gitignore | 2 +-
docker/{ => src/main}/Dockerfile | 18 +++++++++---------
.../iotdb/tsfile/write/schema/MeasurementSchema.java | 3 ---
3 files changed, 10 insertions(+), 13 deletions(-)
rename docker/{ => src/main}/Dockerfile (75%)
[incubator-iotdb] 01/02: use latest binary file to build the docker
image (#312)
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 26f19b1a55b1812dcbc3da03d25d4c9a63b37a29
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Wed Jul 31 10:09:39 2019 +0800
use latest binary file to build the docker image (#312)
* use latest binary file to build the docker image
* move docker/Dockerfile to docker/src/main/
* change version to 0.8.0 and update .gitignore
---
.gitignore | 2 +-
docker/{ => src/main}/Dockerfile | 8 ++++----
.../org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java | 3 ---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 400c94e..f74fb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,4 +84,4 @@ grafana/data/test.csv
tsfile/src/test/resources/*.ts
### Apache release ###
-local-snapshots-dir/
+local-snapshots-dir/
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/src/main/Dockerfile
similarity index 84%
rename from docker/Dockerfile
rename to docker/src/main/Dockerfile
index b3cf982..f3acbea 100644
--- a/docker/Dockerfile
+++ b/docker/src/main/Dockerfile
@@ -29,11 +29,11 @@ RUN apt update \
&& 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 \
+ && mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
+ && cd target/ \
+ && unzip apache-iotdb-0.8.0-SNAPSHOT-incubating-bin.zip \
&& mkdir /iotdb \
- && mv build-0.8.0-SNAPSHOT/* /iotdb/ \
+ && mv apache-iotdb-0.8.0-SNAPSHOT-incubating/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
index 0a8bcbd..687029a 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
@@ -42,9 +42,6 @@ import org.apache.iotdb.tsfile.utils.StringContainer;
* including measurement id, data type, encoding and compressor type. For each TSEncoding,
* MeasurementSchema maintains respective TSEncodingBuilder; For TSDataType, only ENUM has
* TSDataTypeConverter up to now.
- *
- * @author kangrong
- * @since version 0.1.0
*/
public class MeasurementSchema implements Comparable<MeasurementSchema>, Serializable {
[incubator-iotdb] 02/02: change dockerfile to build from the master
branch
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit a3db25477d65e5d5d66bbe8d2d925fab20ad4e00
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jul 31 10:12:58 2019 +0800
change dockerfile to build from the master branch
---
docker/src/main/Dockerfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker/src/main/Dockerfile b/docker/src/main/Dockerfile
index f3acbea..ec2efb8 100644
--- a/docker/src/main/Dockerfile
+++ b/docker/src/main/Dockerfile
@@ -25,20 +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/rel/0.8.zip \
- && unzip 0.8.zip \
- && rm 0.8.zip \
- && cd incubator-iotdb-rel-0.8 \
+ && wget https://github.com/apache/incubator-iotdb/archive/master.zip \
+ && unzip master.zip \
+ && rm master.zip \
+ && cd incubator-iotdb-master \
&& mvn package -pl server,client -am -Papache-release -DskipTests -Dthrift.download-url="http://www.apache.org/licenses/LICENSE-2.0.txt" -Dthrift.exec.absolute.path="/usr/bin/thrift" \
&& cd target/ \
- && unzip apache-iotdb-0.8.0-SNAPSHOT-incubating-bin.zip \
+ && unzip apache-iotdb-0.9.0-SNAPSHOT-incubating-bin.zip \
&& mkdir /iotdb \
- && mv apache-iotdb-0.8.0-SNAPSHOT-incubating/* /iotdb/ \
+ && mv apache-iotdb-0.9.0-SNAPSHOT-incubating/* /iotdb/ \
&& cd ../../ \
&& mvn clean \
&& ls -lh ~/.m2 \
&& rm -rf ~/.m2 \
- && rm -rf /incubator-iotdb-rel-0.8 \
+ && rm -rf /incubator-iotdb-master \
&& sed -i '119d' /iotdb/conf/logback.xml \
&& apt remove wget maven unzip thrift-compiler -y \
&& apt autoremove -y \