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/26 09:21:21 UTC
[incubator-iotdb] branch rel/0.8 updated: let the dockerfile build
from iotdb v0.8 (#305)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin 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 d5b822a let the dockerfile build from iotdb v0.8 (#305)
d5b822a is described below
commit d5b822a3c2b77c5c2ca8a33953b61ad1b9855027
Author: Xiangdong Huang <hx...@qq.com>
AuthorDate: Fri Jul 26 17:21:16 2019 +0800
let the dockerfile build from iotdb v0.8 (#305)
* let the dockerfile build from iotdb v0.8
* try to upgrade scala to 2.11.12 to solve warning when compiling
---
docker/Dockerfile | 17 ++++++++++-------
pom.xml | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 507e2b7..5aecd40 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 \
+ && 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 -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 \
+ && 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 \
diff --git a/pom.xml b/pom.xml
index cd3514a..eb19afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.assembly.version>2.5.5</maven.assembly.version>
- <scala.version>2.11.8</scala.version>
+ <scala.version>2.11.12</scala.version>
<hadoop.version>2.7.3</hadoop.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.12</slf4j.version>