Improve docker compose startup script

docker-compose/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   elasticsearch:
-    container_name: temporal-elasticsearch
+    container_name: temporal-elasticsearch-iwf
     environment:
       - cluster.routing.allocation.disk.threshold_enabled=true
       - cluster.routing.allocation.disk.watermark.low=512mb
@@ -17,7 +17,7 @@ services:
     expose:
       - 9200
   postgresql:
-    container_name: temporal-postgresql
+    container_name: temporal-postgresql-iwf
     environment:
       POSTGRES_PASSWORD: temporal
       POSTGRES_USER: temporal
@@ -27,7 +27,7 @@ services:
     expose:
       - 5432
   temporal:
-    container_name: temporal
+    container_name: temporal-iwf
     depends_on:
       - postgresql
       - elasticsearch
@@ -51,7 +51,7 @@ services:
     volumes:
       - ./dynamicconfig:/etc/temporal/config/dynamicconfig
   temporal-admin-tools:
-    container_name: temporal-admin-tools
+    container_name: temporal-admin-tools-iwf
     depends_on:
       - temporal
     environment:
@@ -65,7 +65,7 @@ services:
      - ./init.sh:/etc/temporal/init.sh
     entrypoint: sh -c "/etc/temporal/init.sh"
   temporal-ui:
-    container_name: temporal-ui
+    container_name: temporal-ui-iwf
     depends_on:
       - temporal
     environment:

docker-compose/init.sh

@@ -3,12 +3,15 @@
 # use new version of tctl so that we can skip the prompt
 tctl config set version next
 
-# TODO break the loop after commands are successful
-for run in {1..20}; do
+for run in {1..60}; do
   sleep 1
-  tctl namespace register default || true
-  tctl search-attribute  create -name IwfWorkflowType -type Keyword -y || true
-  tctl search-attribute  create -name IwfGlobalWorkflowVersion -type Int -y || true
-  tctl search-attribute  create -name IwfExecutingStateIds -type Keyword -y || true
+  echo "now trying to register iWF system search attributes..."
+  if tctl search-attribute  create -name IwfWorkflowType -type Keyword -y; then
+    break
+  fi
 done
 
+tctl search-attribute  create -name IwfGlobalWorkflowVersion -type Int -y
+tctl search-attribute  create -name IwfExecutingStateIds -type Keyword -y
+
+tail -f /dev/null

script/start-server.sh

@@ -22,8 +22,14 @@ do
     echo "Waiting for ${HOST} to be ready..."
   fi
 done
-# TODO remove this hack by using tctl to make sure namespace is registered
-# then remove the hack in init.sh
-echo "now waiting 20s for server to be ready, so that another script will register namespace/search attributes. TODO need to remove this hack... see https://github.com/indeedeng/iwf/issues/74"
-sleep 20
+
+echo "now waiting 20s for server to be ready, so that another script will register namespace/search attributes."
+
+for run in {1..60}; do
+  sleep 1
+  if nc -zv temporal 7233; then
+    break
+  fi
+done
+sleep 2
 "${SRC_ROOT}/iwf-server" --config "${CONFIG_TEMPLATE_PATH}" start "$@"