add logic for --container

build/common/src/utils.d.ts

@@ -15,13 +15,13 @@ export declare class Utils {
     invalidTemplate(json: any): boolean;
     randomString(): string;
     preInstallHznCli(orgId: string, anax: string, nodeId: string, css: string, token: string): Observable<unknown>;
-    installCliInContainer(configJson: any): Observable<unknown>;
     createHorizonSystemFiles(configJson: any): Observable<unknown>;
     removeCliContainer(name?: string): Observable<unknown>;
     removeAnaxContainer(name?: string): Observable<unknown>;
     stopRemoveContainer(name: string): Observable<unknown>;
     installCliAndAnaxInContainers(configJson: any): Observable<unknown>;
     installAnaxInContainer(configJson: any): Observable<unknown>;
+    installCliInContainer(configJson: any): Observable<unknown>;
     updateConfig(configFile: string): Observable<unknown>;
     proceedWithAutoInstall(setup: SetupEnvironment): Observable<unknown>;
     autoRun(params: IAutoParam, setup: SetupEnvironment): Observable<unknown>;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "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/utils.ts

@@ -135,25 +135,6 @@ export class Utils {
       })
     });  
   }
-  installCliInContainer(configJson: any) {
-    return new Observable((observer) => {
-      if(configJson.cliInContainer) {
-        this.shell(configJson.cliInContainer)
-        .subscribe({
-          complete: () => {
-            observer.next()
-            observer.complete();
-          },
-          error: (err) => {
-            observer.error(err);
-          }
-        })
-      } else {
-        console.log('Missing cliInContainer property in configuration file')
-        observer.error();
-      }
-    })
-  }
   createHorizonSystemFiles(configJson: any) {
     return new Observable((observer) => {
       let content = ''
@@ -257,8 +238,19 @@ export class Utils {
                   }
                 })  
               } else {
-                console.log('Missing anaxInContainer property in configuration file')
-                observer.error();
+                let pEnv = process.env;
+                let anax = pEnv.ANAX.replace('/agent-install.sh', '') + '/agent-install.sh';
+                let container = process.platform == 'darwin' ? '' : '--container'
+                let containerStr = `sudo curl -sSL ${anax} | sudo -s -E bash -s -- -i ${anax} ${container} -i css: -k css: -c css:`
+                this.shell(containerStr)
+                .subscribe({
+                  complete: () => {
+                    observer.complete();
+                  },
+                  error: (err) => {
+                    observer.error(err);
+                  }
+                })  
               }
             },
             error: (err) => {
@@ -273,6 +265,25 @@ export class Utils {
       })
     })
   }
+  installCliInContainer(configJson: any) {
+    return new Observable((observer) => {
+      if(configJson.cliInContainer) {
+        this.shell(configJson.cliInContainer)
+        .subscribe({
+          complete: () => {
+            observer.next()
+            observer.complete();
+          },
+          error: (err) => {
+            observer.error(err);
+          }
+        })
+      } else {
+        console.log('Missing cliInContainer property in configuration file')
+        observer.error();
+      }
+    })
+  }
   updateConfig(configFile: string) {
     return new Observable((observer) => {
       try {