qto-200622175852 changing variable names back to upper_case: PROJ_INS…

…TANCE_DIR, PROJ_CONF_FILE and PRODUCT_INSTANCE_DIR as requested Diverdi@6c77871#r40126470

.vimrc

@@ -97,7 +97,7 @@ set wildignore+=**/node_modules/**
 " use perl regexes - src: http://andrewradev.com/2011/05/08/vim-regexes/
 noremap / /\v
 
-" my perl code under <<product_instance_dir>>/src/perl/<<tool-name-only-dir>>
+" my perl code under <<PRODUCT_INSTANCE_DIR>>/src/perl/<<tool-name-only-dir>>
 map <C-c><C-c> :!perl -MCarp::Always -I `pwd`/src/perl/*/ -I `pwd`/src/perl/*/lib/ -wc %
 
 " use perltidy with pre-configured mojolicious settings

1-setup.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# starts deployer from a folder, then QtoDir redirects to a newly created product_instance_dir
+# starts deployer from a folder, then QtoDir redirects to a newly created PRODUCT_INSTANCE_DIR
 
 main(){
 	. ./qto/src/bash/deployer/run.sh "$@"; QtoDir

doc/cheats/qto-cheat-sheet.sh

@@ -8,10 +8,10 @@ perl -MCarp::Always -I `pwd`/src/perl/*/ -I `pwd`/src/perl/*/lib/ -wc \
    src/perl/qto/lib/Qto/App/Db/In/Postgres/RdrPostgresDb.pm
 
 # start load env vars
-export proj_instance_dir=`pwd`  # or could be any qto proj
-export proj_conf_file=`pwd`/cnf/env/prd.env.json  # or could be any qto proj's conf file
+export PROJ_INSTANCE_DIR=`pwd`  # or could be any qto proj
+export PROJ_CONF_FILE=`pwd`/cnf/env/prd.env.json  # or could be any qto proj's conf file
 source lib/bash/funcs/export-json-section-vars.sh
-do_export_json_section_vars $proj_instance_dir/cnf/env/prd.env.json '.env.db'
+do_export_json_section_vars $PROJ_INSTANCE_DIR/cnf/env/prd.env.json '.env.db'
 alias psql="PGPASSWORD=${postgres_db_useradmin_pw:-} psql -v -t -X -w -U ${postgres_db_useradmin:-} --host $postgres_db_host --port $postgres_db_port"
 
 ./src/bash/qto/qto.sh -a provision-db-admin # change the db-admin pw

doc/md/maintenance_guide_doc.md

@@ -210,13 +210,13 @@ Qto provides you with the means and tools to work on tens of databases, yet one
 
     source lib/bash/funcs/export-json-section-vars.sh
     # optionally use a different project than the current product instance dir
-    export proj_instance_dir=/hos/opt/kone/kone-qto
+    export PROJ_INSTANCE_DIR=/hos/opt/kone/kone-qto
 
     # optionally use a differnt configuration file for this proj instance dir
-    export proj_conf_file=/hos/opt/org/org-qto/cnf/env/tst.env.json
+    export PROJ_CONF_FILE=/hos/opt/org/org-qto/cnf/env/tst.env.json
 
     # load the env vars from this project
-    doExportJsonSectionVars $proj_conf_file '.env.db'
+    doExportJsonSectionVars $PROJ_CONF_FILE '.env.db'
 
     # set the psql with the correct credentials valid ONLY for this proj
     alias psql="PGPASSWORD=${postgres_db_useradmin_pw:-} psql -v -t -X -w -U ${postgres_db_useradmin:-} --port $postgres_db_port --host $postgres_db_host"

doc/txt/qto/funcs/generate-md-docs.func.txt

@@ -4,7 +4,7 @@
 
 	# Purpose:
 	# ------------------------------------------------------
-	download all the docs of an qto app onto a <<proj_docs_root_dir>> or <<proj_instance_dir>>/docs/md/ by calling the 
+	download all the docs of an qto app onto a <<proj_docs_root_dir>> or <<PROJ_INSTANCE_DIR>>/docs/md/ by calling the 
    export as md feature by fetching json string from the pre-defined export files table
 	# Prerequisites
 	# ------------------------------------------------------

doc/txt/qto/helps/dev/clone-to-app.help.txt

@@ -13,38 +13,38 @@ doCloneToApp(){
 	tgt_environment_name=$(echo $tgt_environment_name | perl -ne "s/$product_version/0.0.0/g;print")
 	tgt_environment_name=$(echo $tgt_environment_name | perl -ne "s/$env_type/dev/g;print")
 	tgt_product_dir=$product_base_dir/$tgt_app
-	tgt_product_instance_dir=$tgt_product_dir/$tgt_environment_name
-	mkdir -p $tgt_product_instance_dir 
+	tgt_PRODUCT_INSTANCE_DIR=$tgt_product_dir/$tgt_environment_name
+	mkdir -p $tgt_PRODUCT_INSTANCE_DIR 
 
 	# remove everything from the tgt product version dir - no extra files allowed !!!
-	rm -fvr $tgt_product_instance_dir
+	rm -fvr $tgt_PRODUCT_INSTANCE_DIR
 	# if the removal failed exit with error msg
-	[[ $? -eq 0 ]] || doExit 2 "ERROR --- cannot write to $tgt_product_instance_dir !"
+	[[ $? -eq 0 ]] || doExit 2 "ERROR --- cannot write to $tgt_PRODUCT_INSTANCE_DIR !"
 
 	doCreateRelativePackage
-	unzip -o $zip_file -d $tgt_product_instance_dir
+	unzip -o $zip_file -d $tgt_PRODUCT_INSTANCE_DIR
 
 	to_srch=$run_unit
 	to_repl=$tgt_app
 
 	#-- search and replace in file names
-	find "$tgt_product_instance_dir/" -type d |\
+	find "$tgt_PRODUCT_INSTANCE_DIR/" -type d |\
 		perl -nle '$o=$_;s#'"$to_srch"'#'"$to_repl"'#g;$n=$_;`mkdir -p $n` ;'
-	find "$tgt_product_instance_dir/" -type f |\
+	find "$tgt_PRODUCT_INSTANCE_DIR/" -type f |\
 		perl -nle '$o=$_;s#'"$to_srch"'#'"$to_repl"'#g;$n=$_;rename($o,$n) unless -e $n ;'
 
 
-	find $tgt_product_instance_dir -exec file {} \; | grep text | cut -d: -f1| { while read -r file_to_edit ;
+	find $tgt_PRODUCT_INSTANCE_DIR -exec file {} \; | grep text | cut -d: -f1| { while read -r file_to_edit ;
 		do (
 			perl -pi -e "s#$to_srch#$to_repl#g" "$file_to_edit"
 		);
 		done ;
 	}
 
 	# on cygwin the perl -pi leaves backup files => remove them
-	find $tgt_product_instance_dir -type f -name '*.bak' | xargs rm -fv 
+	find $tgt_PRODUCT_INSTANCE_DIR -type f -name '*.bak' | xargs rm -fv 
 
-	cp -v $zip_file $tgt_product_instance_dir
+	cp -v $zip_file $tgt_PRODUCT_INSTANCE_DIR
 
 }
 #eof func doCloneToApp

doc/txt/qto/helps/dev/create-ctags.help.txt

@@ -9,11 +9,11 @@ doCreateCtags(){
 	ctags --help >/dev/null 2>&1 ||
 	{ doLog "ERROR. ctags is not installed or not in PATH. Aborting." >&2; exit 1; }
 	pushd .
-	cd $product_instance_dir
+	cd $PRODUCT_INSTANCE_DIR
 
 	cmd="rm -fv ./tags"                          && doRunCmdAndLog "$cmd"
 	cmd="ctags  -R -n --fields=+i+K+S+l+m+a ."   && doRunCmdAndLog "$cmd"
-	cmd="ls -la $product_instance_dir/tags"       && doRunCmdAndLog "$cmd"
+	cmd="ls -la $PRODUCT_INSTANCE_DIR/tags"       && doRunCmdAndLog "$cmd"
 
 	popd
 }

doc/txt/qto/helps/pckg/create-relative-package.help.txt

@@ -7,8 +7,8 @@
 	creates a zip file with all the files specified in the 
 	met/.<<env_type>>.qto with their relative file paths so that 
 	the user could deploy the product by :
-	mkdir -p <<target_product_instance_dir>>
-	unzip -o <<zip_file>> -d <<target_product_instance_dir>>	
+	mkdir -p <<target_PRODUCT_INSTANCE_DIR>>
+	unzip -o <<zip_file>> -d <<target_PRODUCT_INSTANCE_DIR>>	
 
 	# Prerequisites
 	# ------------------------------------------------------

doc/txt/qto/helps/pckg/remove-package.help.txt

@@ -11,14 +11,14 @@ doRemovePackage(){
 
    #remove the dirs as well
    for dir in `cat "$include_file"`; do (
-       dir="$product_instance_dir/$dir"
+       dir="$PRODUCT_INSTANCE_DIR/$dir"
        test -d "$dir" && cmd="rm -fRv $dir" && doRunCmdAndLog "$cmd"
    );
    done
 
  	cmd="rm -fv $include_file" && \
  	doRunCmdAndLog "$cmd"
-	echo "rm -fvr $product_instance_dir">>"$product_dir/remove-""$environment_name".sh
+	echo "rm -fvr $PRODUCT_INSTANCE_DIR">>"$product_dir/remove-""$environment_name".sh
 	echo "rm -fv $product_dir/remove-""$environment_name".sh>>"$product_dir/remove-""$environment_name".sh
 	nohup bash "$product_dir/remove-""$environment_name".sh &
 }

lib/bash/funcs/export-json-section-vars.sh

@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 # usage example:
-# source $product_instance_dir/lib/bash/funcs/export-json-section-vars.sh
+# source $PRODUCT_INSTANCE_DIR/lib/bash/funcs/export-json-section-vars.sh
 # do_export_json_section_vars cnf/env/dev.env.json '.env.db'
 #
 # alias psql="PGPASSWORD=${postgres_db_useradmin_pw:-} psql -v -t -X -w -U \
@@ -18,7 +18,7 @@ do_export_json_section_vars(){
    test -z "$section" && return
    shift 1;
 
-   source $product_instance_dir/lib/bash/funcs/flush-screen.sh
+   source $PRODUCT_INSTANCE_DIR/lib/bash/funcs/flush-screen.sh
    do_flush_screen
 
    echo "INFO exporting vars from cnf $json_file: "

lib/bash/funcs/flush-screen.sh

@@ -1,9 +1,9 @@
 #------------------------------------------------------------------------------
 # usage example:
-# source $product_instance_dir/lib/bash/funcs/flush-screen.sh
+# source $PRODUCT_INSTANCE_DIR/lib/bash/funcs/flush-screen.sh
 # do_flush_screen
 #
-# if you have sourced $product_instance_dir/lib/bash/funcs/export-json-section-vars.sh before,
+# if you have sourced $PRODUCT_INSTANCE_DIR/lib/bash/funcs/export-json-section-vars.sh before,
 # then this function is also imported, so sourcing again is not necessary
 #------------------------------------------------------------------------------
 do_flush_screen(){

lib/bash/funcs/parse-cnf-env-vars.sh

@@ -14,7 +14,7 @@ doParseCnfEnvVars(){
    test -z "$cnf_file" && echo " you should set the cnf_file !!!"
 
    cnf_dir=$(perl -e 'use File::Basename; use Cwd "abs_path"; print dirname(abs_path(@ARGV[0]));' -- "$cnf_file")
-   product_instance_dir=${cnf_dir%/*}
+   PRODUCT_INSTANCE_DIR=${cnf_dir%/*}
 
    INI_SECTION=MainSection
 
@@ -24,7 +24,7 @@ doParseCnfEnvVars(){
 		-e 's/#.*$//' \
 		-e 's/[[:space:]]*$//' \
 		-e 's/^[[:space:]]*//' \
-		-e "s|%ProductInstanceDir%|${product_instance_dir}|" \
+		-e "s|%ProductInstanceDir%|${PRODUCT_INSTANCE_DIR}|" \
 		-e "s/^\(.*\)=\([^\"']*\)$/export \1=\"\2\"/" \
 		< $cnf_file \
 		| sed -n -e "/^\[$INI_SECTION\]/,/^\s*\[/{/^[^#].*\=.*/p;}"`

src/bash/deploy-vagrant-vm.sh

@@ -82,8 +82,8 @@ do_set_vars(){
    export product_base_dir=$(cd $unit_run_dir/../../..; echo `pwd`)
    export product_dir=$(cd $unit_run_dir/../..; echo `pwd`)
    source "$product_dir/.env"
-   product_instance_dir="$product_dir/$app_to_deploy.$VERSION.$ENV_TYPE.$app_owner"
-   source $product_instance_dir/lib/bash/funcs/flush-screen.sh
+   PRODUCT_INSTANCE_DIR="$product_dir/$app_to_deploy.$VERSION.$ENV_TYPE.$app_owner"
+   source $PRODUCT_INSTANCE_DIR/lib/bash/funcs/flush-screen.sh
 
    host_name="$(hostname -s)"
    bash_opts_file="~/.bash_opts.$host_name"

src/bash/deployer/run.sh

@@ -74,10 +74,10 @@ do_set_vars(){
    perl -pi -e 's|ENV_TYPE=tst|ENV_TYPE=dev|g' "$product_dir/.env"
    perl -pi -e 's|ENV_TYPE=prd|ENV_TYPE=dev|g' "$product_dir/.env"
    source "$product_dir/.env"
-   export product_instance_dir="$product_dir/$app_to_deploy.$VERSION.$ENV_TYPE.$user_at_host"
+   export PRODUCT_INSTANCE_DIR="$product_dir/$app_to_deploy.$VERSION.$ENV_TYPE.$user_at_host"
 
-   # creating a redirect file with QtoDir function leading to product_instance_dir
-   printf "#!/usr/bin/env bash\nmain(){\nQtoDir\n}\nQtoDir(){\ncd $product_instance_dir\n}\nmain\n" > $product_dir/src/bash/deployer/change-to-instance-dir.sh
+   # creating a redirect file with QtoDir function leading to PRODUCT_INSTANCE_DIR
+   printf "#!/usr/bin/env bash\nmain(){\nQtoDir\n}\nQtoDir(){\ncd $PRODUCT_INSTANCE_DIR\n}\nmain\n" > $product_dir/src/bash/deployer/change-to-instance-dir.sh
 
    cd $product_dir
 }
@@ -111,7 +111,7 @@ usage_info(){
       # 1. Install components necessary for QTO:
 	  # Perl modules, Python, Postgres, nginx, redis, etc.
 	  #
-	  # Alternatively you can run the deployer directly, then go to the product_instance_dir yourself
+	  # Alternatively you can run the deployer directly, then go to the PRODUCT_INSTANCE_DIR yourself
 	  # . ./qto/src/bash/deployer/run.sh
 	  # source $(find . -name '.env') && cd ~/opt/qto/qto.$VERSION.$ENV_TYPE.$USER@`hostname -s`
 	  . ./qto/setup.sh
@@ -209,17 +209,17 @@ do_copy_git_hooks(){
 
 
 do_create_multi_env_dir(){
-   printf "\nCreating the $app_to_deploy.$ENV_TYPE directory:\n$product_instance_dir/\n\n"
+   printf "\nCreating the $app_to_deploy.$ENV_TYPE directory:\n$PRODUCT_INSTANCE_DIR/\n\n"
    set -x
 
-   test -d "$product_instance_dir" && \
-      mv -v "$product_instance_dir" "$product_instance_dir"."$(date +%Y%m%d_%H%M%S)"
+   test -d "$PRODUCT_INSTANCE_DIR" && \
+      mv -v "$PRODUCT_INSTANCE_DIR" "$PRODUCT_INSTANCE_DIR"."$(date +%Y%m%d_%H%M%S)"
 
    mv -v "$product_dir" "$product_dir"'_'
-   mkdir -p "$product_dir" ;  mv -v "$product_dir"'_' "$product_instance_dir";
+   mkdir -p "$product_dir" ;  mv -v "$product_dir"'_' "$PRODUCT_INSTANCE_DIR";
 
-   # going to product_instance_dir
-   source $product_instance_dir/src/bash/deployer/change-to-instance-dir.sh
+   # going to PRODUCT_INSTANCE_DIR
+   source $PRODUCT_INSTANCE_DIR/src/bash/deployer/change-to-instance-dir.sh
    export -f QtoDir
 }
 
@@ -231,7 +231,7 @@ do_set_chmods(){
 
 do_finalize(){
    set +x
-   touch $product_instance_dir/bootstraping  # tell the backup db automate to not trigger yet
+   touch $PRODUCT_INSTANCE_DIR/bootstraping  # tell the backup db automate to not trigger yet
 
    do_flush_screen
 

src/bash/load-qto-env.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 usage(){
-   echo provide the proj_conf_file as the first cmd arg - \$1
+   echo provide the PROJ_CONF_FILE as the first cmd arg - \$1
    echo source $0 ~/opt/csitea/csitea.0.8.2.prd.ubuntu@csitea.net/cnf/env/prd.env.json
 }
 
@@ -17,10 +17,10 @@ main(){
    do_set_vars
    test -z ${1:-} && usage
    test -z ${1:-} || {
-      export proj_conf_file=$1
-      export proj_instance_dir=$(cd `dirname $proj_conf_file`/../..; echo `pwd`)
+      export PROJ_CONF_FILE=$1
+      export PROJ_INSTANCE_DIR=$(cd `dirname $PROJ_CONF_FILE`/../..; echo `pwd`)
       source $product_dir/lib/bash/funcs/export-json-section-vars.sh
-      do_export_json_section_vars $proj_conf_file '.env.db';
+      do_export_json_section_vars $PROJ_CONF_FILE '.env.db';
 	  do_flush_screen
       sleep 1
 

src/bash/qto/funcs/backup-postgres-db-inserts.func.sh

@@ -6,12 +6,12 @@
 # ---------------------------------------------------------
 doBackupPostgresDbInserts(){
 
-   test -z "${proj_instance_dir-}" && proj_instance_dir="$product_instance_dir"
-   source $proj_instance_dir/.env ; env_type=$ENV_TYPE
-   test -z ${proj_conf_file:-} && proj_conf_file=$proj_instance_dir/cnf/env/$env_type.env.json
-   do_export_json_section_vars $proj_conf_file '.env.db'
+   test -z "${PROJ_INSTANCE_DIR-}" && PROJ_INSTANCE_DIR="$PRODUCT_INSTANCE_DIR"
+   source $PROJ_INSTANCE_DIR/.env ; env_type=$ENV_TYPE
+   test -z ${PROJ_CONF_FILE:-} && PROJ_CONF_FILE=$PROJ_INSTANCE_DIR/cnf/env/$env_type.env.json
+   do_export_json_section_vars $PROJ_CONF_FILE '.env.db'
 
-   mix_data_dir="$proj_instance_dir/dat/mix"
+   mix_data_dir="$PROJ_INSTANCE_DIR/dat/mix"
    test -z "${postgres_db_name-}" && postgres_db_name="${env_type-}"_"${RUN_UNIT//-/_}"
 
    backup_dir=$mix_data_dir/$(date "+%Y")/$(date "+%Y-%m")/$(date "+%Y-%m-%d")/sql/$postgres_db_name

src/bash/qto/funcs/backup-postgres-db.func.sh

@@ -6,13 +6,13 @@
 # ---------------------------------------------------------
 doBackupPostgresDb(){
 
-   test -f $product_instance_dir/bootstrapping && return
-   test -z "${proj_instance_dir-}" && proj_instance_dir="$product_instance_dir"
-   source $proj_instance_dir/.env ; env_type=$ENV_TYPE
-   test -z ${proj_conf_file:-} && proj_conf_file=$proj_instance_dir/cnf/env/$env_type.env.json
-   do_export_json_section_vars $proj_conf_file '.env.db'
+   test -f $PRODUCT_INSTANCE_DIR/bootstrapping && return
+   test -z "${PROJ_INSTANCE_DIR-}" && PROJ_INSTANCE_DIR="$PRODUCT_INSTANCE_DIR"
+   source $PROJ_INSTANCE_DIR/.env ; env_type=$ENV_TYPE
+   test -z ${PROJ_CONF_FILE:-} && PROJ_CONF_FILE=$PROJ_INSTANCE_DIR/cnf/env/$env_type.env.json
+   do_export_json_section_vars $PROJ_CONF_FILE '.env.db'
 
-   mix_data_dir="$proj_instance_dir/dat/mix"
+   mix_data_dir="$PROJ_INSTANCE_DIR/dat/mix"
    test -z "${postgres_db_name-}" && postgres_db_name="${env_type-}"_"${run_unit//-/_}"
 
    backup_dir=$mix_data_dir/$(date "+%Y")/$(date "+%Y-%m")/$(date "+%Y-%m-%d")/sql/$postgres_db_name

src/bash/qto/funcs/backup-postgres-table.func.sh

@@ -2,15 +2,15 @@
 
 doBackupPostgresTable(){
 
-   test -z "${proj_instance_dir-}" && export proj_instance_dir="$product_instance_dir"
-   source $proj_instance_dir/.env ; env_type=$ENV_TYPE
-   test -z ${proj_conf_file:-} && export proj_conf_file="$proj_instance_dir/cnf/env/$env_type.env.json"
-   do_export_json_section_vars $proj_conf_file '.env.db'
-   do_log "INFO using proj_instance_dir: $proj_instance_dir" ; do_log "INFO using proj_conf_file: $proj_conf_file"
+   test -z "${PROJ_INSTANCE_DIR-}" && export PROJ_INSTANCE_DIR="$PRODUCT_INSTANCE_DIR"
+   source $PROJ_INSTANCE_DIR/.env ; env_type=$ENV_TYPE
+   test -z ${PROJ_CONF_FILE:-} && export PROJ_CONF_FILE="$PROJ_INSTANCE_DIR/cnf/env/$env_type.env.json"
+   do_export_json_section_vars $PROJ_CONF_FILE '.env.db'
+   do_log "INFO using PROJ_INSTANCE_DIR: $PROJ_INSTANCE_DIR" ; do_log "INFO using PROJ_CONF_FILE: $PROJ_CONF_FILE"
 
    test -z ${table:-} && do_exit 1 "no table defined to backup !!!"
 	table="$(echo -e "${table}" | sed -e 's/[[:space:]]*$//')" #or how-to to trin leading space
-   dump_dir=$proj_instance_dir/dat/mix/$(date "+%Y")/$(date "+%Y-%m")/$(date "+%Y-%m-%d")/tmp
+   dump_dir=$PROJ_INSTANCE_DIR/dat/mix/$(date "+%Y")/$(date "+%Y-%m")/$(date "+%Y-%m-%d")/tmp
    mkdir -p $dump_dir || do_exit 1 "cannot create the dump_dir: $dump_dir"
    dump_file=$dump_dir/${postgres_db_name:-}.${table:-}.$(date "+%Y%m%d_%H%M%S").data.sql
 

src/bash/qto/funcs/build-docker-image.func.sh

@@ -1,23 +1,23 @@
 doBuildQtoDockerImage(){
 
-   test -z "${proj_instance_dir-}" && proj_instance_dir="$product_instance_dir"
-   source $proj_instance_dir/.env ; env_type=$ENV_TYPE
-   test -z ${proj_conf_file:-} && export proj_conf_file="$proj_instance_dir/cnf/env/$env_type.env.json"
-   do_export_json_section_vars $proj_conf_file '.env.db'
+   test -z "${PROJ_INSTANCE_DIR-}" && PROJ_INSTANCE_DIR="$PRODUCT_INSTANCE_DIR"
+   source $PROJ_INSTANCE_DIR/.env ; env_type=$ENV_TYPE
+   test -z ${PROJ_CONF_FILE:-} && export PROJ_CONF_FILE="$PROJ_INSTANCE_DIR/cnf/env/$env_type.env.json"
+   do_export_json_section_vars $PROJ_CONF_FILE '.env.db'
 
-   test -f "$product_instance_dir/src/docker/Dockerfile.deploy-$RUN_UNIT.$product_version" || \
+   test -f "$PRODUCT_INSTANCE_DIR/src/docker/Dockerfile.deploy-$RUN_UNIT.$product_version" || \
       do_exit 1 "the src/docker/Dockerfile.deploy-$RUN_UNIT.$product_version cannot be found !!!"
 
    #doRemoveDockerContainers 
    test ${DOCKER_NUCLEAR_OPTION_PURGE:-0} -eq 1 && doFullCleanDocker # obs clears all docker stuff !!!
    #doRemoveDockerImages          
-   cp -v "$product_instance_dir/src/docker/Dockerfile.deploy-$RUN_UNIT.$product_version" "$product_instance_dir/Dockerfile"
+   cp -v "$PRODUCT_INSTANCE_DIR/src/docker/Dockerfile.deploy-$RUN_UNIT.$product_version" "$PRODUCT_INSTANCE_DIR/Dockerfile"
 
    # for quick tests uncomment ^^^ and use this one : 
-   # cp -v "$product_instance_dir/src/docker/Dockerfile.deploy-quick-test" "$product_instance_dir/Dockerfile"
+   # cp -v "$PRODUCT_INSTANCE_DIR/src/docker/Dockerfile.deploy-quick-test" "$PRODUCT_INSTANCE_DIR/Dockerfile"
 
    docker build \
-   --build-arg product_instance_dir=$product_instance_dir \
+   --build-arg PRODUCT_INSTANCE_DIR=$PRODUCT_INSTANCE_DIR \
    --build-arg postgres_db_name=$postgres_db_name \
    --build-arg TZ=${TZ:-} \
    --build-arg ENV_TYPE=$ENV_TYPE \
@@ -32,10 +32,10 @@ doBuildQtoDockerImage(){
    -t qto-image:$product_version.$env_type .
 
    test $? -ne 0 && do_log "FATAL the docker image building failed !!!"
-   rm -v "$product_instance_dir/Dockerfile"
+   rm -v "$PRODUCT_INSTANCE_DIR/Dockerfile"
 
    echo -e "\n\n to instantiate a new container, run: \n"
-   echo -e "bash $product_instance_dir/src/bash/qto/qto.sh -a run-container\n\n"
+   echo -e "bash $PRODUCT_INSTANCE_DIR/src/bash/qto/qto.sh -a run-container\n\n"
 
 }