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/10/20 02:49:08 UTC
[iotdb] 02/13: confignode

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch 1c1d_dockertest
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 3de005e13b93b354c0390d6c7e7f8ea8ed1e15b7
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Sep 19 09:24:03 2022 +0800

    confignode
---
 .github/workflows/client-python.yml                |  3 ++-
 .../{Dockerfile-1c1d => Dockerfile-confignode}     | 30 ++++++++--------------
 .../main/{Dockerfile-1c1d => Dockerfile-datanode}  | 29 ++++++++++-----------
 3 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/client-python.yml b/.github/workflows/client-python.yml
index c92cd9f4ae..a7833c7b60 100644
--- a/.github/workflows/client-python.yml
+++ b/.github/workflows/client-python.yml
@@ -53,7 +53,8 @@ jobs:
         run: mvn -B clean install -pl distribution,client-py -am -DskipTests
       - name: Build IoTDB server docker image
         run: |
-          docker build . -f docker/src/main/Dockerfile-1c1d -t "iotdb:dev"
+          docker build . -f docker/src/main/Dockerfile-confignode -t "iotdb:confignode"
+          docker build . -f docker/src/main/Dockerfile-datanode -t "iotdb:dev"
           docker images
       - name: Install IoTDB python client requirements
         run: pip3 install -r client-py/requirements_dev.txt
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-confignode
similarity index 61%
copy from docker/src/main/Dockerfile-1c1d
copy to docker/src/main/Dockerfile-confignode
index 95b9d69b41..818a233c6d 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-confignode
@@ -21,30 +21,22 @@
 
 FROM openjdk:11-jre-slim
 
-ADD distribution/target/apache-iotdb-*-all-bin.zip /
+ADD distribution/target/apache-iotdb-*-confignode-bin.zip /
 
 RUN apt update \
   && apt install lsof dos2unix procps unzip -y \
   && unzip /apache-iotdb-*-bin.zip -d / \
   && rm /apache-iotdb-*-bin.zip \
-  && mv /apache-iotdb-* /iotdb \
+  && mv /apache-iotdb-* /confignode \
   && apt remove unzip -y \
   && apt autoremove -y \
   && apt purge --auto-remove -y \
-  && apt clean -y \
-RUN dos2unix /iotdb/confignode/sbin/start-confignode.sh
-RUN dos2unix /iotdb/confignode/sbin/../conf/confignode-env.sh
-RUN dos2unix /iotdb/datanode/sbin/start-datanode.sh
-RUN dos2unix /iotdb/datanode/sbin/../conf/datanode-env.sh
-EXPOSE 6667
-EXPOSE 31999
-EXPOSE 5555
-EXPOSE 8086
-EXPOSE 8181
-VOLUME /iotdb/confignode/data
-VOLUME /iotdb/confignode/logs
-VOLUME /iotdb/datanode/data
-VOLUME /iotdb/datanode/logs
-ENV PATH="/iotdb/confignode/sbin/:/iotdb/datanode/sbin/:/iotdb/tools/:${PATH}"
-CMD ["/iotdb/confignode/sbin/start-confignode.sh"]
-ENTRYPOINT ["/iotdb/datanode/sbin/start-datanode.sh"]
+  && apt clean -y
+RUN dos2unix /confignode/sbin/start-confignode.sh
+RUN dos2unix /confignode/sbin/../conf/confignode-env.sh
+EXPOSE 22278
+EXPOSE 22277
+VOLUME /confignode/data
+VOLUME /confignode/logs
+ENV PATH="/datanode/sbin/:${PATH}"
+ENTRYPOINT ["/confignode/sbin/start-confignode.sh"]
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-datanode
similarity index 64%
rename from docker/src/main/Dockerfile-1c1d
rename to docker/src/main/Dockerfile-datanode
index 95b9d69b41..08bba55cac 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-datanode
@@ -21,30 +21,29 @@
 
 FROM openjdk:11-jre-slim
 
-ADD distribution/target/apache-iotdb-*-all-bin.zip /
+ADD distribution/target/apache-iotdb-*-datanode-bin.zip /
 
 RUN apt update \
   && apt install lsof dos2unix procps unzip -y \
   && unzip /apache-iotdb-*-bin.zip -d / \
   && rm /apache-iotdb-*-bin.zip \
-  && mv /apache-iotdb-* /iotdb \
+  && mv /apache-iotdb-* /datanode \
   && apt remove unzip -y \
   && apt autoremove -y \
   && apt purge --auto-remove -y \
-  && apt clean -y \
-RUN dos2unix /iotdb/confignode/sbin/start-confignode.sh
-RUN dos2unix /iotdb/confignode/sbin/../conf/confignode-env.sh
-RUN dos2unix /iotdb/datanode/sbin/start-datanode.sh
-RUN dos2unix /iotdb/datanode/sbin/../conf/datanode-env.sh
+  && apt clean -y
+RUN dos2unix /datanode/sbin/start-datanode.sh
+RUN dos2unix /datanode/sbin/../conf/datanode-env.sh
 EXPOSE 6667
 EXPOSE 31999
-EXPOSE 5555
 EXPOSE 8086
 EXPOSE 8181
-VOLUME /iotdb/confignode/data
-VOLUME /iotdb/confignode/logs
-VOLUME /iotdb/datanode/data
-VOLUME /iotdb/datanode/logs
-ENV PATH="/iotdb/confignode/sbin/:/iotdb/datanode/sbin/:/iotdb/tools/:${PATH}"
-CMD ["/iotdb/confignode/sbin/start-confignode.sh"]
-ENTRYPOINT ["/iotdb/datanode/sbin/start-datanode.sh"]
+EXPOSE 8777
+EXPOSE 9003
+EXPOSE 40010
+EXPOSE 50010
+EXPOSE 22277
+VOLUME /datanode/data
+VOLUME /datanode/logs
+ENV PATH="/datanode/sbin/:/datanode/tools/:${PATH}"
+ENTRYPOINT ["/datanode/sbin/start-datanode.sh"]