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:17 UTC
[iotdb] 11/13: fix
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 5353c0ac79a6a6d884250c8eaf7f01012f8cce6a
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Sep 19 15:49:11 2022 +0800
fix
---
client-py/requirements.txt | 6 ++---
client-py/requirements_dev.txt | 10 ++++----
docker/src/main/Dockerfile-confignode | 42 ------------------------------
docker/src/main/Dockerfile-datanode | 48 -----------------------------------
4 files changed, 8 insertions(+), 98 deletions(-)
diff --git a/client-py/requirements.txt b/client-py/requirements.txt
index 83cf2c3aec..521bb7ed83 100644
--- a/client-py/requirements.txt
+++ b/client-py/requirements.txt
@@ -19,8 +19,8 @@
# Pandas Export
pandas>=1.3.5
# Testcontainer
-testcontainers>=3.3.0
+testcontainers==3.3.0
numpy>=1.21.4
# SQLAlchemy Dialect
-sqlalchemy>=1.3.20
-sqlalchemy-utils>=0.36.8
\ No newline at end of file
+sqlalchemy == 1.3.20
+sqlalchemy-utils == 0.36.8
\ No newline at end of file
diff --git a/client-py/requirements_dev.txt b/client-py/requirements_dev.txt
index c470e45e53..824831a319 100644
--- a/client-py/requirements_dev.txt
+++ b/client-py/requirements_dev.txt
@@ -18,10 +18,10 @@
-r requirements.txt
# Pytest to run tests
-pytest>=6.2.2
+pytest==6.2.2
thrift==0.14.1
-flake8>=3.9.0
-black>=20.8b1
+flake8==3.9.0
+black==20.8b1
# For releases
-twine>=3.4.1
-wheel>=0.36.2
\ No newline at end of file
+twine==3.4.1
+wheel==0.36.2
\ No newline at end of file
diff --git a/docker/src/main/Dockerfile-confignode b/docker/src/main/Dockerfile-confignode
deleted file mode 100644
index 0ba8afa1c5..0000000000
--- a/docker/src/main/Dockerfile-confignode
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# 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.
-#
-
-# docker build context is the root path of the repository
-
-FROM openjdk:11-jre-slim
-
-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-* /confignode \
- && apt remove unzip -y \
- && apt autoremove -y \
- && apt purge --auto-remove -y \
- && 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="/confignode/sbin/:${PATH}"
-ENTRYPOINT ["/confignode/sbin/start-confignode.sh"]
diff --git a/docker/src/main/Dockerfile-datanode b/docker/src/main/Dockerfile-datanode
deleted file mode 100644
index 82e36eb87b..0000000000
--- a/docker/src/main/Dockerfile-datanode
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# 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.
-#
-
-# docker build context is the root path of the repository
-
-FROM openjdk:11-jre-slim
-
-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-* /datanode \
- && apt remove unzip -y \
- && apt autoremove -y \
- && apt purge --auto-remove -y \
- && apt clean -y
-RUN dos2unix /datanode/sbin/start-datanode.sh
-RUN dos2unix /datanode/sbin/../conf/datanode-env.sh
-EXPOSE 6667
-EXPOSE 31999
-EXPOSE 8086
-EXPOSE 8181
-EXPOSE 8777
-EXPOSE 9003
-EXPOSE 40010
-EXPOSE 50010
-VOLUME /datanode/data
-VOLUME /datanode/logs
-ENV PATH="/datanode/sbin/:/datanode/tools/:${PATH}"
-ENTRYPOINT ["/datanode/sbin/start-datanode.sh"]