Update PUSH.md

hpcc-systems · Oct 8, 2019 · 90bc161 · 90bc161
1 parent 89aa1af
commit 90bc161
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/PUSH.md b/PUSH.md
@@ -14,7 +14,9 @@ sudo  docker build -t <platform|clienttools>:<tag> --build-arg version=<version>
 ```
 
 ```console
-sudo  docker tag <platform|clienttools>:<tag> <Docker Image Registry Repository>:<tag>
+#sudo  docker tag <platform|clienttools>:<tag> <Docker Image Registry Repository>:<tag>
+#for example,
+sudo  docker tag hpccsystems/platform:7.4.24-1 446598291512.dkr.ecr.us-east-2.amazonaws.com/hpccsystems/platform:7.4.24-1
 ```
 
 ### Push
@@ -52,11 +54,13 @@ ECR is regional service not global service. Pulling images cross regions is poss
 
 ### Login
 ```console
-$(aws ecr get-login --no-include-email --region us-east-2)
+sudo $(aws ecr get-login --no-include-email --region us-east-2)
 
 ```
 
 ### Push
 ```console
-docker push <aws account id>.dkr.ecr.us-east-2.amazonaws.com/hpcc-systems-platform:<tag>
+#sudo docker push <aws account id>.dkr.ecr.us-east-2.amazonaws.com/hpcc-systems-platform:<tag>
+#for example,
+sudo  docker push 446598291512.dkr.ecr.us-east-2.amazonaws.com/hpccsystems/platform:7.4.24-1
 ```
diff --git a/deployment/admin/Dockerfile b/deployment/admin/Dockerfile
@@ -1,6 +1,8 @@
 FROM hpccsystems/hpcc-base:7-bionic
 
-ARG version=7.4.10-1
+ARG version=
+RUN if [ -z "${version}" ] ; then echo Missing HPCC version; exit 1; else : ; fi
+
 #ENV PLATFORM_DOWNLOAD_MD5  a62b43a1ef1ecf7d8d702d9033e9cf39
 RUN set -ex; \
    apt-get update; \

diff --git a/deployment/admin/hpcc-tools/config_hpcc.sh b/deployment/admin/hpcc-tools/config_hpcc.sh
@@ -251,7 +251,7 @@ function adjust_node_type_for_ansible()
     dali_ip=$($SUDOCMD /opt/HPCCSystems/sbin/configgen -env ${clusterConfigDir}/environment.xml -listall -t dali | cut -d',' -f3)
     echo $dali_ip > ${ipDir2}/dali
 
-    if [ -e ${ipDirs2}/node ]
+    if [ -e ${ipDir2}/node ]
     then
          node_to_process=node
     else

diff --git a/deployment/admin/hpcc-tools/kube/CollectIPsFromKube.py b/deployment/admin/hpcc-tools/kube/CollectIPsFromKube.py
@@ -25,7 +25,7 @@ def retrieveIPsFromCloud(self, input_fn):
             full_node_name,node_ip = line.split(' ')
             node_ip = node_ip.rstrip('\r\n')
             node_name_items =  full_node_name.split('-')
-            if ( len(node_name_items) >= 3 ):
+            if ( len(node_name_items) >= 3 ) and ( node_name_items[0] != 'support' ):
                 node_name = node_name_items[0] + "-" + node_name_items[1]
             elif node_name_items[0] == 'thormaster':
                 node_name = node_name_items[0] + '-' + node_name_items[1]