You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/12/26 01:26:20 UTC
[iotdb] branch master updated: change docker images name from 1c1d to standalone, including docs (#8596)
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 30335b3a73 change docker images name from 1c1d to standalone, including docs (#8596)
30335b3a73 is described below
commit 30335b3a7378f563ba341550fb77738113be6b8e
Author: changxue2022 <11...@users.noreply.github.com>
AuthorDate: Mon Dec 26 09:26:15 2022 +0800
change docker images name from 1c1d to standalone, including docs (#8596)
---
docker/ReadMe.md | 4 ++--
docker/src/main/DockerCompose/do-docker-build.sh | 18 +++++++++++++-----
...-compose-1c1d.yml => docker-compose-standalone.yml} | 2 +-
...ckerfile-1.0.0-1c1d => Dockerfile-1.0.0-standalone} | 0
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 6 +++---
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 6 +++---
6 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/docker/ReadMe.md b/docker/ReadMe.md
index 09c627f7a8..039f337d37 100644
--- a/docker/ReadMe.md
+++ b/docker/ReadMe.md
@@ -28,7 +28,7 @@ From 0.12 on, we release two images: one is for a single node, and the other is
The format is: `apache/iotdb:0.<major>.<minor>-node` and `apache/iotdb:0.<major>.<minor>-cluster`.
From 1.0.0, we split 3 kinds of images: datanode,confignode and all of them in one image called 1C1D.
-The format is: `apache/iotdb:<version>-confignode`,`apache/iotdb:<version>-datanode` and `apache/iotdb:<version>-1c1d`.
+The format is: `apache/iotdb:<version>-confignode`,`apache/iotdb:<version>-datanode` and `apache/iotdb:<version>-standalone`.
## The definition of tag "latest"
Before v0.12, the "latest" tag will forward to the largest `apache/iotdb:0.<major>.<minor>`.
@@ -48,7 +48,7 @@ docker build -t my-iotdb:<version> -f Dockerfile-<version>
cd src/main/DockerCompose
./do-docker-build.sh -t <target> -v <version>
e.g.
-./do-docker-build.sh -t confignode -v 1.0.0
+./do-docker-build.sh -t standalone -v 1.0.0
```
Notice:
Make directory of src/main/target and put the zip file downloading from the official download page.
diff --git a/docker/src/main/DockerCompose/do-docker-build.sh b/docker/src/main/DockerCompose/do-docker-build.sh
index a655a00659..96940cc2d7 100755
--- a/docker/src/main/DockerCompose/do-docker-build.sh
+++ b/docker/src/main/DockerCompose/do-docker-build.sh
@@ -23,7 +23,7 @@
current_path=$(cd $(dirname $0); pwd)
iotdb_path=$(cd ${current_path}/../../../../; pwd)
iotdb_zip_path=${current_path}/../target/
-options="confignode datanode 1c1d"
+options="confignode datanode standalone latest"
nocache="true"
do_build="false"
docker_build="docker build "
@@ -76,8 +76,13 @@ set -ex
function build_single(){
echo "##### build docker image #####"
- local dockerfile="Dockerfile-1.0.0-$1"
- local image="${image_prefix}:${version}-$1"
+ if [[ "$1" == "latest" ]]; then
+ local dockerfile="Dockerfile-1.0.0-standalone"
+ local image="${image_prefix}:latest"
+ else
+ local dockerfile="Dockerfile-1.0.0-$1"
+ local image="${image_prefix}:${version}-$1"
+ fi
cd ${current_path}/../
${docker_build} -f ${dockerfile} \
--build-arg version=${version} \
@@ -146,7 +151,10 @@ function main() {
datanode)
process_single
;;
- 1c1d)
+ standalone)
+ process_single all
+ ;;
+ latest)
process_single all
;;
all)
@@ -155,7 +163,7 @@ function main() {
for b in $options ; do
build_single ${b}
done
- ;;
+ ;;
*)
echo "bad value of -t ."
print_usage ;;
diff --git a/docker/src/main/DockerCompose/docker-compose-1c1d.yml b/docker/src/main/DockerCompose/docker-compose-standalone.yml
similarity index 96%
rename from docker/src/main/DockerCompose/docker-compose-1c1d.yml
rename to docker/src/main/DockerCompose/docker-compose-standalone.yml
index 92bc8dc7fb..4680bbe779 100644
--- a/docker/src/main/DockerCompose/docker-compose-1c1d.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-1c1d
+ image: apache/iotdb:1.0.0-standalone
hostname: iotdb-service
container_name: iotdb-service
ports:
diff --git a/docker/src/main/Dockerfile-1.0.0-1c1d b/docker/src/main/Dockerfile-1.0.0-standalone
similarity index 100%
rename from docker/src/main/Dockerfile-1.0.0-1c1d
rename to docker/src/main/Dockerfile-1.0.0-standalone
diff --git a/docs/UserGuide/QuickStart/WayToGetIoTDB.md b/docs/UserGuide/QuickStart/WayToGetIoTDB.md
index a27258caed..e5c3f4a27b 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.0-1c1d
+docker pull apache/iotdb:1.0.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
@@ -104,7 +104,7 @@ docker run -d --name iotdb-service \
-e dn_rpc_address=iotdb-service \
-e dn_internal_address=iotdb-service \
-e dn_target_config_node_list=iotdb-service:22277 \
- apache/iotdb:1.0.0-1c1d
+ apache/iotdb:1.0.0-standalone
# execute SQL
docker exec -ti iotdb-service /iotdb/sbin/start-cli.sh -h iotdb-service
```
@@ -119,7 +119,7 @@ Notice：The confignode service would fail when restarting this container if the
version: "3"
services:
iotdb-service:
- image: apache/iotdb:1.0.0-1c1d
+ image: apache/iotdb:1.0.0-standalone
hostname: iotdb-service
container_name: iotdb-service
ports:
diff --git a/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md b/docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md
index b32da068c5..26519e44ff 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.0-1c1d
+docker pull apache/iotdb:1.0.0-standalone
# 创建 docker bridge 网络
docker network create --driver=bridge --subnet=172.18.0.0/16 --gateway=172.18.0.1 iotdb
# 创建 docker 容器
@@ -107,7 +107,7 @@ docker run -d --name iotdb-service \
-e dn_rpc_address=iotdb-service \
-e dn_internal_address=iotdb-service \
-e dn_target_config_node_list=iotdb-service:22277 \
- apache/iotdb:1.0.0-1c1d
+ apache/iotdb:1.0.0-standalone
# 尝试使用命令行执行SQL
docker exec -ti iotdb-service /iotdb/sbin/start-cli.sh -h iotdb-service
```
@@ -121,7 +121,7 @@ $IOTDB_HOME/sbin/start-cli.sh -h <主机IP/hostname> -p 6667
version: "3"
services:
iotdb-service:
- image: apache/iotdb:1.0.0-1c1d
+ image: apache/iotdb:1.0.0-standalone
hostname: iotdb-service
container_name: iotdb-service
ports: