This is an automated email from the ASF dual-hosted git repository.
HTHou 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 34528ad93d3 Stop publishing standalone CLI and node distributions
(#18622)
34528ad93d3 is described below
commit 34528ad93d3a91a9a77cf0b2ffc5874aa707597f
Author: Haonan <[email protected]>
AuthorDate: Wed Sep 16 16:16:23 2026 +0800
Stop publishing standalone CLI and node distributions (#18622)
---
.github/scripts/test-edge-ops.py | 2 -
distribution/pom.xml | 6 --
distribution/src/assembly/cli.xml | 74 -------------------
distribution/src/assembly/confignode.xml | 92 -----------------------
distribution/src/assembly/datanode.xml | 94 ------------------------
docker/ReadMe.md | 17 +++--
docker/src/main/DockerCompose/do-docker-build.sh | 6 +-
docker/src/main/Dockerfile-1.0.0-confignode | 2 +-
docker/src/main/Dockerfile-1.0.0-datanode | 5 +-
9 files changed, 15 insertions(+), 283 deletions(-)
diff --git a/.github/scripts/test-edge-ops.py b/.github/scripts/test-edge-ops.py
index ef16fd04ca8..42c6a33c8fe 100644
--- a/.github/scripts/test-edge-ops.py
+++ b/.github/scripts/test-edge-ops.py
@@ -438,8 +438,6 @@ class AssemblyTest(unittest.TestCase):
)
for descriptor in (
"distribution/src/assembly/all.xml",
- "distribution/src/assembly/datanode.xml",
- "distribution/src/assembly/confignode.xml",
"iotdb-core/datanode/src/assembly/server.xml",
"iotdb-core/confignode/src/assembly/confignode.xml",
):
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 4a8b1c33c94..94d5ce68d99 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -85,9 +85,6 @@
<configuration>
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
-
<descriptor>src/assembly/datanode.xml</descriptor>
-
<descriptor>src/assembly/confignode.xml</descriptor>
- <descriptor>src/assembly/cli.xml</descriptor>
<descriptor>src/assembly/library-udf.xml</descriptor>
<descriptor>src/assembly/edge.xml</descriptor>
</descriptors>
@@ -119,9 +116,6 @@
<directory>${project.build.directory}</directory>
<includes>
<include>apache-iotdb-${project.version}-all-bin.zip</include>
-
<include>apache-iotdb-${project.version}-datanode-bin.zip</include>
-
<include>apache-iotdb-${project.version}-cli-bin.zip</include>
-
<include>apache-iotdb-${project.version}-confignode-bin.zip</include>
<include>apache-iotdb-${project.version}-library-udf-bin.zip</include>
<include>apache-iotdb-${project.version}-external-service-impl-bin.zip</include>
<include>apache-iotdb-${project.version}-edge-bin.zip</include>
diff --git a/distribution/src/assembly/cli.xml
b/distribution/src/assembly/cli.xml
deleted file mode 100644
index 6f4eed7f7c2..00000000000
--- a/distribution/src/assembly/cli.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<assembly>
- <id>cli-bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <baseDirectory>apache-iotdb-${project.version}-cli-bin</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:iotdb-cli:zip</include>
- </includes>
- <outputDirectory>${file.separator}</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/../scripts/sbin</directory>
- <outputDirectory>sbin</outputDirectory>
- <includes>
- <include>*cli.*</include>
- <include>**/*cli.*</include>
- <include>**/*cli-table.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/tools</directory>
- <outputDirectory>tools</outputDirectory>
- <includes>
- <include>*data.*</include>
- <include>*schema.*</include>
- <include>*tsfile.*</include>
- <include>**/*data.*</include>
- <include>**/*schema.*</include>
- <include>**/*tsfile.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
-
<source>${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
- <outputDirectory>conf</outputDirectory>
- <fileMode>0755</fileMode>
- </file>
- </files>
- <componentDescriptors>
- <componentDescriptor>common-files.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/distribution/src/assembly/confignode.xml
b/distribution/src/assembly/confignode.xml
deleted file mode 100644
index ee107cf17f5..00000000000
--- a/distribution/src/assembly/confignode.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<assembly>
- <id>confignode-bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
-
<baseDirectory>apache-iotdb-${project.version}-confignode-bin</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:iotdb-confignode:zip:*</include>
- </includes>
- <outputDirectory>${file.separator}</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
-
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- </fileSet>
- <fileSet>
- <outputDirectory>conf</outputDirectory>
-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
- <excludes>
- <exclude>edge/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>confignode-env.*</include>
- <include>**/confignode-env.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>iotdb-common.sh</include>
- <include>windows/iotdb-common.bat</include>
- </includes>
- <filtered>true</filtered>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/sbin</directory>
- <outputDirectory>sbin</outputDirectory>
- <includes>
- <include>*confignode.*</include>
- <include>**/*confignode.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/tools</directory>
- <outputDirectory>tools</outputDirectory>
- <includes>
- <include>*confignode.*</include>
- <include>**/*confignode.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <componentDescriptors>
- <componentDescriptor>common-files.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/distribution/src/assembly/datanode.xml
b/distribution/src/assembly/datanode.xml
deleted file mode 100644
index 0cb7b66a280..00000000000
--- a/distribution/src/assembly/datanode.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<assembly>
- <id>datanode-bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <baseDirectory>apache-iotdb-${project.version}-server-bin</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*:iotdb-server:zip:*</include>
- <include>*:iotdb-cli:zip:*</include>
- </includes>
- <outputDirectory>${file.separator}</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <unpack>true</unpack>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <outputDirectory>conf</outputDirectory>
-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
- <excludes>
- <exclude>edge/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <includes>
- <include>datanode-env.*</include>
- <include>**/datanode-env.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/sbin</directory>
- <outputDirectory>sbin</outputDirectory>
- <includes>
- <include>*datanode.*</include>
- <include>**/*datanode.*</include>
- <include>*cli.*</include>
- <include>**/*cli.*</include>
- <include>**/*cli-table.*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../scripts/tools</directory>
- <outputDirectory>tools</outputDirectory>
- <excludes>
- <exclude>**/*confignode.*</exclude>
- <exclude>**/*all.*</exclude>
- <exclude>**/*ainode.*</exclude>
- <exclude>**/*edge.*</exclude>
- </excludes>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
-
<source>${maven.multiModuleProjectDirectory}/external-service-impl/mqtt/target/mqtt-${project.version}-jar-with-dependencies.jar</source>
- <outputDirectory>lib</outputDirectory>
- </file>
- <file>
-
<source>${maven.multiModuleProjectDirectory}/external-service-impl/rest/target/rest-${project.version}-jar-with-dependencies.jar</source>
- <outputDirectory>lib</outputDirectory>
- </file>
- </files>
- <componentDescriptors>
- <componentDescriptor>common-files.xml</componentDescriptor>
- </componentDescriptors>
-</assembly>
diff --git a/docker/ReadMe.md b/docker/ReadMe.md
index 84a8ed12fdd..55a627e836e 100644
--- a/docker/ReadMe.md
+++ b/docker/ReadMe.md
@@ -58,15 +58,16 @@ cd src/main
./build-ainode.sh -v 2.0.8-SNAPSHOT -d /data/ainode
```
Notice:
-Make directory of src/main/target and put the zip file downloading from the
official download page.
-e.g.
+Create `src/main/target` and place the downloaded release archives there.
+ConfigNode, DataNode, standalone and latest images all use
`apache-iotdb-<version>-all-bin.zip`;
+their entrypoints still start only the requested components. The separate CLI,
ConfigNode and
+DataNode archives are no longer published. AINode uses its own archive.
+
+For example:
```shell
-$ ls -hl target/
-total 215M
--rw-r--r-- 1 root root 75M Nov 30 20:04 apache-iotdb-1.0.0-all-bin.zip
--rw-r--r-- 1 root root 69M Dec 1 17:12 apache-iotdb-1.0.0-confignode-bin.zip
--rw-r--r-- 1 root root 73M Dec 1 17:13 apache-iotdb-1.0.0-datanode-bin.zip
--rw-r--r-- 1 root root 329K 7 15 17:12
apache-iotdb-2.0.5-SNAPSHOT-ainode-bin.zip
+$ ls target/
+apache-iotdb-2.0.11-SNAPSHOT-all-bin.zip
+apache-iotdb-2.0.11-SNAPSHOT-ainode-bin.zip
```
To avoid mannually copy these files, you can run our `do-docker-build.sh` with
argument `-b`.
diff --git a/docker/src/main/DockerCompose/do-docker-build.sh
b/docker/src/main/DockerCompose/do-docker-build.sh
index 749528faf7d..f7cf6529a15 100755
--- a/docker/src/main/DockerCompose/do-docker-build.sh
+++ b/docker/src/main/DockerCompose/do-docker-build.sh
@@ -123,7 +123,7 @@ function build_iotdb(){
mvn clean package -pl distribution -P with-ainode -am -DskipTests
if [[ ! -d ${iotdb_zip_path} ]]; then mkdir ${iotdb_zip_path}; fi
cd ${iotdb_path}/distribution/target
- cp apache-iotdb-${version}-all-bin.zip
apache-iotdb-${version}-confignode-bin.zip
apache-iotdb-${version}-datanode-bin.zip apache-iotdb-${version}-ainode-bin.zip
${iotdb_zip_path}/
+ cp apache-iotdb-${version}-all-bin.zip
apache-iotdb-${version}-ainode-bin.zip ${iotdb_zip_path}/
do_build=false
echo "##### done #####"
}
@@ -147,10 +147,10 @@ function main() {
prepare_buildx
case "$build_what" in
confignode)
- process_single
+ process_single all
;;
datanode)
- process_single
+ process_single all
;;
ainode)
process_single all
diff --git a/docker/src/main/Dockerfile-1.0.0-confignode
b/docker/src/main/Dockerfile-1.0.0-confignode
index 7fd7319b1e8..c7376075816 100644
--- a/docker/src/main/Dockerfile-1.0.0-confignode
+++ b/docker/src/main/Dockerfile-1.0.0-confignode
@@ -18,7 +18,7 @@
#
FROM eclipse-temurin:17-jre-focal
ARG version=1.0.0
-ARG target=apache-iotdb-${version}-confignode-bin
+ARG target=apache-iotdb-${version}-all-bin
RUN apt update \
&& apt install lsof dos2unix procps unzip dumb-init -y \
diff --git a/docker/src/main/Dockerfile-1.0.0-datanode
b/docker/src/main/Dockerfile-1.0.0-datanode
index 32f3c0fe17f..7f34b291ada 100644
--- a/docker/src/main/Dockerfile-1.0.0-datanode
+++ b/docker/src/main/Dockerfile-1.0.0-datanode
@@ -18,7 +18,7 @@
#
FROM eclipse-temurin:17-jre-focal
ARG version=1.0.0
-ARG target=apache-iotdb-${version}-datanode-bin
+ARG target=apache-iotdb-${version}-all-bin
RUN apt update \
&& apt install lsof dos2unix procps unzip dumb-init wget inetutils-ping -y \
@@ -29,8 +29,7 @@ RUN apt update \
COPY target/${target}.zip /
RUN cd / && unzip ${target}.zip \
&& rm ${target}.zip \
-# && mv ${target} iotdb
- && mv apache-iotdb-${version}-server-bin iotdb
+ && mv ${target} iotdb
ENV IOTDB_HOME=/iotdb VERSION=${version}
WORKDIR ${IOTDB_HOME}/sbin
