INDY-1332: fix docker files.

Signed-off-by: Sergey Shilov <[email protected]>

environment/docker/pool/node.init.ubuntu.dockerfile

@@ -21,7 +21,7 @@ RUN echo " " >> /etc/indy/indy_config.py
 
 # Init indy-node
 RUN init_indy_node $nodename $nip $nport $cip $cport
-EXPOSE $nip $nport $cip $cport
+EXPOSE $nport $cport
 RUN if [ ! -z "$ips" ] && [ ! -z "$nodenum" ] && [ ! -z "$nodecnt" ]; then generate_indy_pool_transactions --nodes $nodecnt --clients $clicnt --nodeNum $nodenum --ips "$ips"; fi
 USER root
 CMD ["/bin/bash", "-c", "exec /sbin/init --log-target=journal 3>&1"]

environment/docker/pool/node_build.sh

@@ -1,24 +1,26 @@
 #!/bin/bash
 
 NODE_NAME="$1"
-NPORT="$2"
-CPORT="$3"
-NODE_IMAGE_TAG="$4"
-IPS="$5"
-CNT="$6"
-CLI_CNT="$7"
-NODE_NUM="$8"
-NODE_IMAGE_TAG="$9"
+NIP="$2"
+NPORT="$3"
+CIP="$4"
+CPORT="$5"
+NODE_IMAGE_TAG="$6"
+IPS="$7"
+CNT="$8"
+CLI_CNT="$9"
+NODE_NUM="${10}"
+NODE_IMAGE_TAG="${11}"
 
 SCRIPT_DIR=$(dirname $0)
 USER_ID="$(id -u)"
 
 if [ "$NODE_NAME" = "--help" ] ; then
-        echo "Usage: $0 <node-name> <node-port> <client-port> <node-image-tag> <cluster-ips> <node-cnt> <cli-cnt> <node-num>"
+        echo "Usage: $0 <node-name> <node-ip> <node-port> <client-ip> <client-port> <node-image-tag> <cluster-ips> <node-cnt> <cli-cnt> <node-num>"
         exit 1
 fi
 
-if [ -z "$NODE_NAME" ] || [ -z "$NPORT" ] || [ -z "$CPORT" ]; then
+if [ -z "$NODE_NAME" ] || [ -z "$NIP" ] || [ -z "$NPORT" ] || [ -z "$CIP" ] || [ -z "$CPORT" ]; then
         echo "Incorrect input. Type $0 --help for help."
 	exit 1
 fi
@@ -27,7 +29,7 @@ if [ -z "$NODE_IMAGE_TAG" ]; then
 	NODE_IMAGE_TAG="$(echo "$NODE_NAME" | tr '[:upper:]' '[:lower:]')"
 fi
 
-echo "Creating a new node ${NODE_NAME} ${NPORT} ${CPORT}"
+echo "Creating a new node ${NODE_NAME} ${NIP} ${NPORT} ${CIP} ${CPORT}"
 
 echo "Setting up docker with systemd"
 docker run --rm --privileged -v /:/host solita/ubuntu-systemd setup
@@ -37,6 +39,16 @@ docker build -t 'indybase' -f ${SCRIPT_DIR}/base.systemd.ubuntu.dockerfile $SCRI
 echo "Building indycore for user ${USER_ID}"
 docker build -t 'indycore' --build-arg uid=$USER_ID -f ${SCRIPT_DIR}/core.ubuntu.dockerfile $SCRIPT_DIR
 echo "Building $NODE_IMAGE_TAG"
-docker build -t "$NODE_IMAGE_TAG" --build-arg nodename=$NODE_NAME --build-arg nport=$NPORT --build-arg cport=$CPORT --build-arg ips=$IPS --build-arg nodenum=$NODE_NUM --build-arg nodecnt=$CNT --build-arg clicnt=$CLI_CNT -f ${SCRIPT_DIR}/node.init.ubuntu.dockerfile $SCRIPT_DIR
-
-echo "Node ${NODE_NAME} ${NPORT} ${CPORT} created"
+docker build -t "$NODE_IMAGE_TAG"   \
+    --build-arg nodename=$NODE_NAME \
+    --build-arg nip=$NIP            \
+    --build-arg nport=$NPORT        \
+    --build-arg cip=$CIP            \
+    --build-arg cport=$CPORT        \
+    --build-arg ips=$IPS            \
+    --build-arg nodenum=$NODE_NUM   \
+    --build-arg nodecnt=$CNT        \
+    --build-arg clicnt=$CLI_CNT     \
+    -f ${SCRIPT_DIR}/node.init.ubuntu.dockerfile $SCRIPT_DIR
+
+echo "Node ${NODE_NAME} ${NIP} ${NPORT} ${CIP} ${CPORT} created"

environment/docker/pool/pool_build.sh

@@ -58,13 +58,15 @@ IPS_ARRAY=($IPS)
 IFS=$ORIGINAL_IFS
 for i in `seq 1 $CNT`; do
         NODE_NAME="${BASE_NODE_NAME}${i}"
+        NIP=${IPS_ARRAY[i-1]}
         NPORT=$PORT
         ((PORT++))
+        CIP=${IPS_ARRAY[i-1]}
         CPORT=$PORT
         ((PORT++))
         NODE_IMAGE_TAG="$(echo "$NODE_NAME" | tr '[:upper:]' '[:lower:]')"
         POOL_DATA="${POOL_DATA},$NODE_IMAGE_TAG ${IPS_ARRAY[i-1]} $NPORT $CPORT"
-        $SCRIPT_DIR/node_build.sh $NODE_NAME $NPORT $CPORT $NODE_IMAGE_TAG  "${IPS}" $CNT $CLI_CNT $i
+        $SCRIPT_DIR/node_build.sh $NODE_NAME $NIP $NPORT $CIP $CPORT $NODE_IMAGE_TAG  "${IPS}" $CNT $CLI_CNT $i
 done
 POOL_DATA=${POOL_DATA:1}