Skip to content

Stop publishing standalone CLI, ConfigNode and DataNode distributions #18622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HTHou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop publishing standalone CLI, ConfigNode and DataNode distributions #18622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/scripts/test-edge-ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
):
Expand Down
6 changes: 0 additions & 6 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
74 changes: 0 additions & 74 deletions distribution/src/assembly/cli.xml
View file
Open in desktop

This file was deleted.

92 changes: 0 additions & 92 deletions distribution/src/assembly/confignode.xml
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions distribution/src/assembly/datanode.xml
View file
Open in desktop

This file was deleted.

17 changes: 9 additions & 8 deletions docker/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
6 changes: 3 additions & 3 deletions docker/src/main/DockerCompose/do-docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####"
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/src/main/Dockerfile-1.0.0-confignode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 2 additions & 3 deletions docker/src/main/Dockerfile-1.0.0-datanode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
Loading