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 19279e372c5d2a44a6e2f2ac8f24e1545b547398 Author: HTHou <[email protected]> AuthorDate: Mon Oct 24 14:41:27 2022 +0800 use 1c1d docker to run python and influxdb protocal IT --- .github/workflows/client-python.yml | 2 +- .github/workflows/influxdb-protocol.yml | 2 +- client-py/tests/test_dataframe.py | 4 +-- docker/src/main/Dockerfile-1c1d-influxdb | 57 ++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/.github/workflows/client-python.yml b/.github/workflows/client-python.yml index c92cd9f4ae..234cef50c9 100644 --- a/.github/workflows/client-python.yml +++ b/.github/workflows/client-python.yml @@ -5,7 +5,7 @@ name: Python Client on: push: branches: - - 1c1d_dockertest + - master - 'rel/*' - "new_*" paths-ignore: diff --git a/.github/workflows/influxdb-protocol.yml b/.github/workflows/influxdb-protocol.yml index 7aac7da02c..9a111fd9dc 100644 --- a/.github/workflows/influxdb-protocol.yml +++ b/.github/workflows/influxdb-protocol.yml @@ -61,7 +61,7 @@ jobs: - name: Build Docker Image run: | - docker build . -f docker/src/main/Dockerfile-single-influxdb -t "apache/iotdb:influxdb-protocol-on" + docker build . -f docker/src/main/Dockerfile-1c1d-influxdb -t "apache/iotdb:influxdb-protocol-on" docker images - name: IT Test diff --git a/client-py/tests/test_dataframe.py b/client-py/tests/test_dataframe.py index c7cce58ea5..f4f97a0b98 100644 --- a/client-py/tests/test_dataframe.py +++ b/client-py/tests/test_dataframe.py @@ -78,8 +78,8 @@ def test_non_time_query(): "FLOAT", "GORILLA", "SNAPPY", - None, - None, + "null", + "null", ] ], ) diff --git a/docker/src/main/Dockerfile-1c1d-influxdb b/docker/src/main/Dockerfile-1c1d-influxdb new file mode 100644 index 0000000000..9488efbdc0 --- /dev/null +++ b/docker/src/main/Dockerfile-1c1d-influxdb @@ -0,0 +1,57 @@ +# +# 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-*-all-bin.zip / +ADD docker/src/main/DockerCompose/start-1c1d.sh / + +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 /start-1c1d.sh /iotdb/sbin \ + && sed -i '/^# enable_influxdb_rpc_service=false/a enable_influxdb_rpc_service=true' /iotdb/sbin/../conf/iotdb-datanode.properties \ + && apt remove unzip -y \ + && apt autoremove -y \ + && apt purge --auto-remove -y \ + && apt clean -y +RUN dos2unix /iotdb/sbin/start-1c1d.sh +RUN dos2unix /iotdb/sbin/start-confignode.sh +RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh +RUN dos2unix /iotdb/sbin/start-datanode.sh +RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh +EXPOSE 6667 +EXPOSE 31999 +EXPOSE 5555 +EXPOSE 8086 +EXPOSE 8181 +EXPOSE 22278 +EXPOSE 22277 +EXPOSE 8777 +EXPOSE 9003 +EXPOSE 40010 +EXPOSE 50010 +VOLUME /iotdb/data +VOLUME /iotdb/logs +ENV PATH="/iotdb/sbin/:/iotdb/tools/:${PATH}" +ENTRYPOINT ["/iotdb/sbin/start-1c1d.sh"]
