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:09:43 UTC
[incubator-iotdb] branch rel/0.8 updated: use latest binary file to
build the docker image (#312)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push:
new 8bddb96 use latest binary file to build the docker image (#312)
8bddb96 is described below
commit 8bddb969eb98faada7313c61d5fe5f2899bec5ce
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 | 24 ++++++----------------
docker/{ => src/main}/Dockerfile | 8 ++++----
.../tsfile/write/schema/MeasurementSchema.java | 3 ---
3 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore
index 891a4e8..f74fb7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,8 @@
-iotdb/data/*
-iotdb/derby.log
-iotdb/iotdb/data/*
-iotdb/iotdb/derby.log
-iotdb/*.pid
-iotdb/iotdb/data/*
-iotdb/iotdb/gc.log*
-iotdb/iotdb/logs/*
-iotdb/iotdb/lib/*
-iotdb/unsequence/
-iotdb/testunsequence
-conf/*
-lib/*
-sbin/*
-tools/*
+**/*.pid
+**/gc.log*
+**/logs/*
+**/lib/**
+**/data/**
tsfile/src/test/resources/perTestInputData
# Eclipse IDE files
@@ -40,7 +30,6 @@ derby-tsfile-db
**/target/
# intermediately generated locally
-**/logs/
tsfile-timeseries/src/main/resources/logback.out.out.xml
tsfile-timeseries/src/main/resources/logback.out.xml
@@ -53,7 +42,6 @@ tsfile-jdbc/src/main/resources/output/queryRes.csv
*.gz
*.tar.gz
*.tar
-/data/
#src/test/resources/logback.xml
@@ -96,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 {