diff --git a/.github/scripts/test-edge-ops.py b/.github/scripts/test-edge-ops.py index ef16fd04ca84..42c6a33c8fe5 100644 --- a/.github/scripts/test-edge-ops.py +++ b/.github/scripts/test-edge-ops.py @@ -438,8 +438,6 @@ def test_edge_ops_are_executable_and_only_in_edge_packages(self): ) 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 4a8b1c33c947..94d5ce68d993 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -85,9 +85,6 @@ src/assembly/all.xml - src/assembly/datanode.xml - src/assembly/confignode.xml - src/assembly/cli.xml src/assembly/library-udf.xml src/assembly/edge.xml @@ -119,9 +116,6 @@ ${project.build.directory} apache-iotdb-${project.version}-all-bin.zip - apache-iotdb-${project.version}-datanode-bin.zip - apache-iotdb-${project.version}-cli-bin.zip - apache-iotdb-${project.version}-confignode-bin.zip apache-iotdb-${project.version}-library-udf-bin.zip apache-iotdb-${project.version}-external-service-impl-bin.zip apache-iotdb-${project.version}-edge-bin.zip diff --git a/distribution/src/assembly/cli.xml b/distribution/src/assembly/cli.xml deleted file mode 100644 index 6f4eed7f7c25..000000000000 --- a/distribution/src/assembly/cli.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - cli-bin - - dir - zip - - apache-iotdb-${project.version}-cli-bin - - - - *:iotdb-cli:zip - - ${file.separator} - ${artifact.artifactId}.${artifact.extension} - true - - - - - ${project.basedir}/../scripts/sbin - sbin - - *cli.* - **/*cli.* - **/*cli-table.* - - 0755 - - - ${project.basedir}/../scripts/tools - tools - - *data.* - *schema.* - *tsfile.* - **/*data.* - **/*schema.* - **/*tsfile.* - - 0755 - - - - - ${project.basedir}/../iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml - conf - 0755 - - - - common-files.xml - - diff --git a/distribution/src/assembly/confignode.xml b/distribution/src/assembly/confignode.xml deleted file mode 100644 index ee107cf17f5a..000000000000 --- a/distribution/src/assembly/confignode.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - confignode-bin - - dir - zip - - apache-iotdb-${project.version}-confignode-bin - - - - *:iotdb-confignode:zip:* - - ${file.separator} - ${artifact.artifactId}.${artifact.extension} - true - - - - - ${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf - conf - - - conf - ${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf - - edge/** - - - - ${project.basedir}/../scripts/conf - conf - - confignode-env.* - **/confignode-env.* - - 0755 - - - ${project.basedir}/../scripts/conf - conf - - iotdb-common.sh - windows/iotdb-common.bat - - true - 0755 - - - ${project.basedir}/../scripts/sbin - sbin - - *confignode.* - **/*confignode.* - - 0755 - - - ${project.basedir}/../scripts/tools - tools - - *confignode.* - **/*confignode.* - - 0755 - - - - common-files.xml - - diff --git a/distribution/src/assembly/datanode.xml b/distribution/src/assembly/datanode.xml deleted file mode 100644 index 0cb7b66a2809..000000000000 --- a/distribution/src/assembly/datanode.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - datanode-bin - - dir - zip - - apache-iotdb-${project.version}-server-bin - - - - *:iotdb-server:zip:* - *:iotdb-cli:zip:* - - ${file.separator} - ${artifact.artifactId}.${artifact.extension} - true - - - - - conf - ${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf - - edge/** - - - - ${project.basedir}/../scripts/conf - conf - - datanode-env.* - **/datanode-env.* - - 0755 - - - ${project.basedir}/../scripts/sbin - sbin - - *datanode.* - **/*datanode.* - *cli.* - **/*cli.* - **/*cli-table.* - - 0755 - - - ${project.basedir}/../scripts/tools - tools - - **/*confignode.* - **/*all.* - **/*ainode.* - **/*edge.* - - 0755 - - - - - ${maven.multiModuleProjectDirectory}/external-service-impl/mqtt/target/mqtt-${project.version}-jar-with-dependencies.jar - lib - - - ${maven.multiModuleProjectDirectory}/external-service-impl/rest/target/rest-${project.version}-jar-with-dependencies.jar - lib - - - - common-files.xml - - diff --git a/docker/ReadMe.md b/docker/ReadMe.md index 84a8ed12fdd3..55a627e836e4 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--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 749528faf7d0..f7cf6529a153 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 7fd7319b1e8e..c73760758160 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 32f3c0fe17f6..7f34b291ada7 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