From 81efb072832d95865ed3bd38a1504b5114b69754 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Mon, 24 Feb 2020 17:10:40 +0000
Subject: [PATCH] adf-cli Provide a way to pass buildArgs to the docker build
 (#5507)

* Provide a way to pass buildArgs to the docker build

* Create folder in case does not exist
---
 lib/cli/scripts/docker-publish.ts |  3 ++-
 scripts/build/build-cli.sh        | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/cli/scripts/docker-publish.ts b/lib/cli/scripts/docker-publish.ts
index 60c6453816..058d51d9c6 100644
--- a/lib/cli/scripts/docker-publish.ts
+++ b/lib/cli/scripts/docker-publish.ts
@@ -28,6 +28,7 @@ export interface PublishArgs {
     loginPassword?: string;
     loginRepo?: string;
     dockerRepo?: string;
+    buildArgs?: string;
     dockerTags?: string;
     pathProject: string;
 }
@@ -40,7 +41,7 @@ function loginPerform(args: PublishArgs) {
 
 function buildImagePerform(args: PublishArgs, tag: string) {
     logger.info(`Perform docker build...${args.dockerRepo}:${tag}`);
-    const response = exec('docker', ['build', `-t=${args.dockerRepo}:${tag}`, args.pathProject], {});
+    const response = exec('docker', ['build', `-t=${args.dockerRepo}:${tag}`, `--build-arg=${args.buildArgs}`, args.pathProject], {});
     logger.info(response);
 }
 
diff --git a/scripts/build/build-cli.sh b/scripts/build/build-cli.sh
index edbe9553fe..0200f5a464 100755
--- a/scripts/build/build-cli.sh
+++ b/scripts/build/build-cli.sh
@@ -11,9 +11,17 @@ echo "====== Build ======"
 npm run dist
 
 cd $DIR/../../
-rm -rf ./lib/dist/cli/ && \
-cp -R ./lib/cli/dist lib/dist/cli/
+if [ -e "./lib/dist/cli" ];
+then
+    rm -rf "./lib/dist/cli" ;
+else if [ ! -d "./lib/dist" ];
+    then
+    mkdir ./lib/dist
+    fi
+fi
 
+cp -R ./lib/cli/dist lib/dist/cli/
+exit 0
 echo "====== Move to node_modules ======"
 rm -rf ./node_modules/@alfresco/adf-cli/ && \
 mkdir -p ./node_modules/@alfresco/adf-cli/ && \