update docker cluster script

tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh

@@ -34,7 +34,7 @@ done
 function addTaoscfg {
   for i in {1..5}
   do 
-    touch /data/node$i/cfg/taos.cfg
+    touch $DOCKER_DIR/node$i/cfg/taos.cfg
     echo 'firstEp          tdnode1:6030' > $DOCKER_DIR/node$i/cfg/taos.cfg
     echo 'fqdn             tdnode'$i >> $DOCKER_DIR/node$i/cfg/taos.cfg
     echo 'arbitrator       tdnode1:6042' >> $DOCKER_DIR/node$i/cfg/taos.cfg
@@ -101,19 +101,19 @@ function clusterUp {
 
   if [ $NUM_OF_NODES -eq 2 ]; then
     echo "create 2 dnodes"
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION docker-compose up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose up -d
   fi
 
   if [ $NUM_OF_NODES -eq 3 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION  docker-compose -f docker-compose.yml -f node3.yml up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml -f node3.yml up -d
   fi
 
   if [ $NUM_OF_NODES -eq 4 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION  docker-compose -f docker-compose.yml -f node3.yml -f node4.yml up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml -f node3.yml -f node4.yml up -d
   fi
 
   if [ $NUM_OF_NODES -eq 5 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION  docker-compose -f docker-compose.yml -f node3.yml -f node4.yml -f node5.yml up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml -f node3.yml -f node4.yml -f node5.yml up -d
   fi
 
   echo "docker compose finish"

tests/pytest/cluster/clusterEnvSetup/docker-compose.yml

@@ -9,6 +9,7 @@ services:
          - TARBITRATORPKG=${TARBITRATORPKG}
          - EXTRACTDIR=${DIR}
          - EXTRACTDIR2=${DIR2}
+         - DATADIR=${DATADIR}
      image: 'tdengine:${VERSION}'
      container_name: 'tdnode1'     
      cap_add:
@@ -32,19 +33,19 @@ services:
      volumes: 
        # bind data directory
        - type: bind
-         source: /data/node1/data
+         source: ${DATADIR}/node1/data
          target: /var/lib/taos
        # bind log directory
        - type: bind
-         source: /data/node1/log
+         source: ${DATADIR}/node1/log
          target: /var/log/taos
        # bind configuration
        - type: bind
-         source: /data/node1/cfg
+         source: ${DATADIR}/node1/cfg
          target: /etc/taos
        # bind core dump path
        - type: bind
-         source: /data/node1/core
+         source: ${DATADIR}/node1/core
          target: /coredump
        - type: bind
          source: /data
@@ -61,6 +62,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
+         - DATADIR=${DATADIR}
      image: 'tdengine:${VERSION}'
      container_name: 'tdnode2'     
      cap_add:
@@ -84,22 +86,22 @@ services:
      volumes: 
        # bind data directory
        - type: bind
-         source: /data/node2/data
+         source: ${DATADIR}/node2/data
          target: /var/lib/taos
        # bind log directory
        - type: bind
-         source: /data/node2/log
+         source: ${DATADIR}/node2/log
          target: /var/log/taos
        # bind configuration
        - type: bind
-         source: /data/node2/cfg
+         source: ${DATADIR}/node2/cfg
          target: /etc/taos
        # bind core dump path 
        - type: bind
-         source: /data/node2/core
+         source: ${DATADIR}/node2/core
          target: /coredump      
        - type: bind
-         source: /data
+         source: ${DATADIR}
          target: /root
      hostname: tdnode2
      networks:

tests/pytest/cluster/clusterEnvSetup/node3.yml

@@ -7,6 +7,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
+         - DATADIR=${DATADIR}
      image: 'tdengine:${VERSION}'
      container_name: 'tdnode3'   
      cap_add:
@@ -30,22 +31,22 @@ services:
      volumes: 
        # bind data directory
        - type: bind
-         source: /data/node3/data
+         source: ${DATADIR}/node3/data
          target: /var/lib/taos
        # bind log directory
        - type: bind
-         source: /data/node3/log
+         source: ${DATADIR}/node3/log
          target: /var/log/taos
        # bind configuration
        - type: bind
-         source: /data/node3/cfg
+         source: ${DATADIR}/node3/cfg
          target: /etc/taos
        # bind core dump path 
        - type: bind
-         source: /data/node3/core
+         source: ${DATADIR}/node3/core
          target: /coredump
        - type: bind
-         source: /data
+         source: ${DATADIR}
          target: /root
      hostname: tdnode3
      networks:

tests/pytest/cluster/clusterEnvSetup/node4.yml

@@ -7,6 +7,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
+         - DATADIR=${DATADIR}
      image: 'tdengine:${VERSION}'
      container_name: 'tdnode4'     
      cap_add:
@@ -30,23 +31,23 @@ services:
      volumes: 
        # bind data directory
        - type: bind
-         source: /data/node4/data
+         source: ${DATADIR}/node4/data
          target: /var/lib/taos
        # bind log directory
        - type: bind
-         source: /data/node4/log
+         source: ${DATADIR}/node4/log
          target: /var/log/taos
        # bind configuration
        - type: bind
-         source: /data/node4/cfg
+         source: ${DATADIR}/node4/cfg
          target: /etc/taos
-       # bind core dump path
+       # bind core dump path 
        - type: bind
-         source: /data/node4/core
+         source: ${DATADIR}/node4/core
          target: /coredump
        - type: bind
-         source: /data
-         target: /root  
+         source: ${DATADIR}
+         target: /root
      hostname: tdnode4
      networks:
          taos_update_net:

tests/pytest/cluster/clusterEnvSetup/node5.yml

@@ -7,6 +7,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
+         - DATADIR=${DATADIR}
      image: 'tdengine:${VERSION}'
      container_name: 'tdnode5'     
      cap_add:
@@ -30,22 +31,22 @@ services:
      volumes: 
        # bind data directory
        - type: bind
-         source: /data/node5/data
+         source: ${DATADIR}/node5/data
          target: /var/lib/taos
        # bind log directory
        - type: bind
-         source: /data/node5/log
+         source: ${DATADIR}/node5/log
          target: /var/log/taos
        # bind configuration
        - type: bind
-         source: /data/node5/cfg
+         source: ${DATADIR}/node5/cfg
          target: /etc/taos
        # bind core dump path
        - type: bind
-         source: /data/node5/core
+         source: ${DATADIR}/node5/core
          target: /coredump
        - type: bind
-         source: /data
+         source: ${DATADIR}
          target: /root
      hostname: tdnode5     
      networks: