Merge pull request #86 from playground/auto-setup-4

unRegisterAgent true

Dockerfile-amd64

@@ -3,7 +3,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 RUN apt-get update -y && apt-get install -y apt-utils vim curl sudo
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x  | bash -
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | bash -
 RUN apt-get -y install nodejs
 RUN npm install -g npm
 RUN npm install -g hzn-cli

Dockerfile-arm64

@@ -3,7 +3,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 RUN apt-get update -y && apt-get install -y apt-utils vim curl sudo
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x  | bash -
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | bash -
 RUN apt-get -y install nodejs
 RUN npm install -g npm
 RUN npm install -g hzn-cli

install-mgmt-hub.sh

@@ -8,8 +8,8 @@ set -e
 # @playground
 
 # Define versions
-INSTALL_NODE_VER=16
-INSTALL_NVM_VER=0.39.1
+INSTALL_NODE_VER=20
+INSTALL_NVM_VER=0.39.5
 
 # You can pass argument to this script --version 8
 if [ "$1" = '--version' ]; then

install.sh

@@ -158,8 +158,8 @@ if [[ -f "${HOME}/.nvm/nvm.sh" ]]; then
   [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 else echo "nvm not installed"
 	# Define versions
-	INSTALL_NODE_VER=16
-	INSTALL_NVM_VER=0.39.1
+	INSTALL_NODE_VER=20
+	INSTALL_NVM_VER=0.39.5
 
 	# You can pass argument to this script --version 8
 	if [ "$1" = '--version' ]; then

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Open Horizon CLI toolkit helps streamline the process of preparing node agents and perform tasks between orgs environments",
   "main": "./build/index.js",
   "bin": {

src/common/src/hzn.ts

@@ -207,7 +207,7 @@ export class Hzn {
     return utils.shell(arg, 'done publishing mss pattern', 'failed to publish mms pattern', false);
   }
   unregisterAgent() {
-    return utils.unregisterAgent()
+    return utils.unregisterAgent(true)
   }
   register() {
     return utils.register(this)

src/common/src/utils.ts

@@ -1900,7 +1900,7 @@ export class Utils {
         observer.complete()
       } else if(answer == 1) {
         console.log('\x1b[32m', '\nRegister with a Policy') 
-        this.registerWithPolicy(hzn.param.name, this.getPolicyJson(policyType.nodePolicy))
+        this.registerWithPolicy(hzn.param.name, this.getPolicyJson(policyType.nodePolicy), true)
         .subscribe(() => {observer.next(1); observer.complete()})
       } else if(answer == 2) {
         console.log('\x1b[32m', '\nRegister with a Pattern')