This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new e6f0355d45 docker deploy for v1.1.0, update docs and docker-compose
files (#9528)
e6f0355d45 is described below
commit e6f0355d45b5611f78ece708a580fd683dd3d590
Author: changxue2022 <[email protected]>
AuthorDate: Thu Apr 6 15:54:33 2023 +0800
docker deploy for v1.1.0, update docs and docker-compose files (#9528)
---
.../src/main/DockerCompose/docker-compose-cluster-1c2d.yml | 6 +++---
docker/src/main/DockerCompose/docker-compose-host-3c3d.yml | 4 ++--
docker/src/main/DockerCompose/docker-compose-standalone.yml | 3 ++-
docker/src/main/Dockerfile-1.0.0-datanode | 3 ++-
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 13 +++++++------
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 11 ++++++-----
6 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
b/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
index e8a1930731..b430929639 100644
--- a/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
+++ b/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
@@ -19,7 +19,7 @@
version: "3"
services:
iodb-confignode:
- image: apache/iotdb:1.0.1-confignode
+ image: apache/iotdb:1.1.0-confignode
hostname: iotdb-confignode
container_name: iotdb-confignode
environment:
@@ -35,7 +35,7 @@ services:
ipv4_address: 172.18.0.2
iotdb-datanode1:
- image: apache/iotdb:1.0.1-datanode
+ image: apache/iotdb:1.1.0-datanode
hostname: iotdb-datanode-1
container_name: iotdb-datanode-1
ports:
@@ -56,7 +56,7 @@ services:
ipv4_address: 172.18.0.3
iotdb-datanode2:
- image: apache/iotdb:1.0.1-datanode
+ image: apache/iotdb:1.1.0-datanode
hostname: iotdb-datanode-2
container_name: iotdb-datanode-2
environment:
diff --git a/docker/src/main/DockerCompose/docker-compose-host-3c3d.yml
b/docker/src/main/DockerCompose/docker-compose-host-3c3d.yml
index 096cdc0bb7..03ac8ec9fd 100644
--- a/docker/src/main/DockerCompose/docker-compose-host-3c3d.yml
+++ b/docker/src/main/DockerCompose/docker-compose-host-3c3d.yml
@@ -19,7 +19,7 @@
version: "3"
services:
iotdb-confignode:
- image: apache/iotdb:1.0.1-confignode
+ image: apache/iotdb:1.1.0-confignode
container_name: iotdb-confignode
environment:
- cn_internal_address=iotdb-1
@@ -36,7 +36,7 @@ services:
network_mode: "host"
iotdb-datanode:
- image: apache/iotdb:1.0.1-datanode
+ image: apache/iotdb:1.1.0-datanode
container_name: iotdb-datanode
environment:
- dn_rpc_address=iotdb-1
diff --git a/docker/src/main/DockerCompose/docker-compose-standalone.yml
b/docker/src/main/DockerCompose/docker-compose-standalone.yml
index d1595c5fcf..7724cce21e 100644
--- a/docker/src/main/DockerCompose/docker-compose-standalone.yml
+++ b/docker/src/main/DockerCompose/docker-compose-standalone.yml
@@ -19,7 +19,7 @@
version: "3"
services:
iotdb-service:
- image: apache/iotdb:1.0.0-standalone
+ image: apache/iotdb:latest
hostname: iotdb-service
container_name: iotdb-service
ports:
@@ -30,6 +30,7 @@ services:
- cn_consensus_port=10720
- cn_target_config_node_list=iotdb-service:10710
- dn_rpc_address=iotdb-service
+ - dn_internal_address=iotdb-service
- dn_rpc_port=6667
- dn_mpp_data_exchange_port=10740
- dn_schema_region_consensus_port=10750
diff --git a/docker/src/main/Dockerfile-1.0.0-datanode
b/docker/src/main/Dockerfile-1.0.0-datanode
index c6ad20e7de..13152cd267 100644
--- a/docker/src/main/Dockerfile-1.0.0-datanode
+++ b/docker/src/main/Dockerfile-1.0.0-datanode
@@ -29,7 +29,8 @@ RUN apt update \
COPY target/${target}.zip /
RUN cd / && unzip ${target}.zip \
&& rm ${target}.zip \
- && mv apache-iotdb-${version}-server-bin iotdb
+ && mv ${target} iotdb
+# && mv apache-iotdb-${version}-server-bin iotdb
ENV IOTDB_HOME=/iotdb VERSION=${version}
WORKDIR ${IOTDB_HOME}/sbin
diff --git a/docs/UserGuide/QuickStart/WayToGetIoTDB.md
b/docs/UserGuide/QuickStart/WayToGetIoTDB.md
index 7c61b2c971..bda484bcd2 100644
--- a/docs/UserGuide/QuickStart/WayToGetIoTDB.md
+++ b/docs/UserGuide/QuickStart/WayToGetIoTDB.md
@@ -90,7 +90,7 @@ Add environments of docker to update the configurations of
Apache IoTDB.
#### Have a try
```shell
# get IoTDB official image
-docker pull apache/iotdb:1.0.1-standalone
+docker pull apache/iotdb:1.1.0-standalone
# create docker bridge network
docker network create --driver=bridge --subnet=172.18.0.0/16
--gateway=172.18.0.1 iotdb
# create docker container
@@ -110,7 +110,7 @@ docker run -d --name iotdb-service \
-e dn_schema_region_consensus_port=10750 \
-e dn_data_region_consensus_port=10760 \
-e dn_rpc_port=6667 \
- apache/iotdb:1.0.1-standalone
+ apache/iotdb:1.1.0-standalone
# execute SQL
docker exec -ti iotdb-service /iotdb/sbin/start-cli.sh -h iotdb-service
```
@@ -125,7 +125,7 @@ Notice：The confignode service would fail when restarting
this container if the
version: "3"
services:
iotdb-service:
- image: apache/iotdb:1.0.1-standalone
+ image: apache/iotdb:1.1.0-standalone
hostname: iotdb-service
container_name: iotdb-service
ports:
@@ -136,6 +136,7 @@ services:
- cn_consensus_port=10720
- cn_target_config_node_list=iotdb-service:10710
- dn_rpc_address=iotdb-service
+ - dn_internal_address=iotdb-service
- dn_rpc_port=6667
- dn_mpp_data_exchange_port=10740
- dn_schema_region_consensus_port=10750
@@ -162,8 +163,8 @@ Here is the docker-compose file of iotdb-2, as the sample:
version: "3"
services:
iotdb-confignode:
- image: apache/iotdb:1.0.1-confignode
- container_name: iotdb-confignode1.0.1-
+ image: apache/iotdb:1.1.0-confignode
+ container_name: iotdb-confignode
environment:
- cn_internal_address=iotdb-2
- cn_target_config_node_list=iotdb-1:10710
@@ -181,7 +182,7 @@ services:
network_mode: "host"
iotdb-datanode:
- image: apache/iotdb:1.0.1-datanode
+ image: apache/iotdb:1.1.0-datanode
container_name: iotdb-datanode
environment:
- dn_rpc_address=iotdb-2
diff --git a/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md
b/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md
index 2ee4a88634..52bf70c735 100644
--- a/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md
+++ b/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md
@@ -92,7 +92,7 @@ Apache IoTDB 的配置项以环境变量形式添加到容器内。
#### 简单尝试
```shell
# 获取镜像
-docker pull apache/iotdb:1.0.1-standalone
+docker pull apache/iotdb:1.1.0-standalone
# 创建 docker bridge 网络
docker network create --driver=bridge --subnet=172.18.0.0/16
--gateway=172.18.0.1 iotdb
# 创建 docker 容器
@@ -113,7 +113,7 @@ docker run -d --name iotdb-service \
-e dn_schema_region_consensus_port=10750 \
-e dn_data_region_consensus_port=10760 \
-e dn_rpc_port=6667 \
- apache/iotdb:1.0.1-standalone
+ apache/iotdb:1.1.0-standalone
# 尝试使用命令行执行SQL
docker exec -ti iotdb-service /iotdb/sbin/start-cli.sh -h iotdb-service
```
@@ -127,7 +127,7 @@ $IOTDB_HOME/sbin/start-cli.sh -h <主机IP/hostname> -p 6667
version: "3"
services:
iotdb-service:
- image: apache/iotdb:1.0.1-standalone
+ image: apache/iotdb:1.1.0-standalone
hostname: iotdb-service
container_name: iotdb-service
ports:
@@ -138,6 +138,7 @@ services:
- cn_consensus_port=10720
- cn_target_config_node_list=iotdb-service:10710
- dn_rpc_address=iotdb-service
+ - dn_internal_address=iotdb-service
- dn_rpc_port=6667
- dn_mpp_data_exchange_port=10740
- dn_schema_region_consensus_port=10750
@@ -163,7 +164,7 @@ networks:
version: "3"
services:
iotdb-confignode:
- image: apache/iotdb:1.0.1-confignode
+ image: apache/iotdb:1.1.0-confignode
container_name: iotdb-confignode
environment:
- cn_internal_address=iotdb-2
@@ -182,7 +183,7 @@ services:
network_mode: "host"
iotdb-datanode:
- image: apache/iotdb:1.0.1-datanode
+ image: apache/iotdb:1.1.0-datanode
container_name: iotdb-datanode
environment:
- dn_rpc_address=iotdb-2
