balena-cloud-apps 1.0.37 → 1.0.39

package/.gitattributes

@@ -1,2 +1,4 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+*.sh text eol=lf
+core.symlinks=true

package/README.md

@@ -22,15 +22,15 @@ Initialize .env and package.json:
 
 ### Configure template environment
 
-Complete common definitions:
+Complete common definitions (leading and trailing ( spaces ) when defining arrays !!):
 ```common.env
-BALENA_PROJECTS=(MY/PATH MY/RELATIVE/PATH)
-BALENA_PROJECTS_FLAGS=(BALENA_MACHINE_NAME MY_VARIABLE)
+BALENA_PROJECTS=( MY/PATH MY/RELATIVE/PATH )
+BALENA_PROJECTS_FLAGS=( BALENA_MACHINE_NAME MY_VARIABLE )
 ```
 Define architectures: 
 An ARM computer units like Raspberry PI use `armhf.env` (or `aarch64.env` if it's deployed on a 64 bits platform), desktop units are often `x86_64.env`:
 ```x86_64.env
-DKR_ARCH=x86_64
+BALENA_ARCH=x86_64
 BALENA_MACHINE_NAME=intel-nuc
 IMG_TAG=latest
 PRIMARY_HUB=docker-hub-balenalib-repo\\/container-servìce-image

package/aarch64.env

@@ -1,4 +1,4 @@
-DKR_ARCH=aarch64
+BALENA_ARCH=aarch64
 BALENA_MACHINE_NAME=generic-aarch64
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/generic-aarch64

package/armhf.env

@@ -1,4 +1,4 @@
-DKR_ARCH=armhf
+BALENA_ARCH=armhf
 BALENA_MACHINE_NAME=raspberrypi3
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/raspberrypi3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cloud-apps",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Shell scripts package to the containers native interface BalenaOS for the Raspberry Pi.",
   "main": "index.js",
   "directories": {

package/test/build/aarch64.env

@@ -1,4 +1,4 @@
-DKR_ARCH=aarch64
+BALENA_ARCH=aarch64
 BALENA_MACHINE_NAME=generic-aarch64
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/generic-aarch64

package/test/build/armhf.env

@@ -1,4 +1,4 @@
-DKR_ARCH=armhf
+BALENA_ARCH=armhf
 BALENA_MACHINE_NAME=raspberrypi3
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/raspberrypi3

package/test/build/submodule/Dockerfile.aarch64

@@ -1,10 +1,10 @@
 ARG BALENA_MACHINE_NAME
 FROM balenalib/${BALENA_MACHINE_NAME:-generic-aarch64}:latest
-ARG DKR_ARCH
-ENV DKR_ARCH ${DKR_ARCH:-aarch64}
+ARG BALENA_ARCH
+ENV BALENA_ARCH ${BALENA_ARCH:-aarch64}
 RUN ["cross-build-start"]
 
-RUN printf "* %s VM, %s IMAGE" "$(arch)" "$DKR_ARCH"
+RUN printf "* %s VM, %s IMAGE" "$(arch)" "$BALENA_ARCH"
 
 RUN ["cross-build-end"]
 

package/test/build/submodule/Dockerfile.armhf

@@ -1,10 +1,10 @@
 ARG BALENA_MACHINE_NAME
 FROM balenalib/${BALENA_MACHINE_NAME:-raspberrypi3}:latest
-ARG DKR_ARCH
-ENV DKR_ARCH ${DKR_ARCH:-armhf}
+ARG BALENA_ARCH
+ENV BALENA_ARCH ${BALENA_ARCH:-armhf}
 RUN ["cross-build-start"]
 
-RUN printf "* %s VM, %s IMAGE" "$(arch)" "$DKR_ARCH"
+RUN printf "* %s VM, %s IMAGE" "$(arch)" "$BALENA_ARCH"
 
 RUN ["cross-build-end"]
 

package/test/build/submodule/Dockerfile.template

@@ -1,10 +1,10 @@
 ARG BALENA_MACHINE_NAME
 FROM balenalib/${BALENA_MACHINE_NAME:-raspberrypi3}:latest
-ARG DKR_ARCH
-ENV DKR_ARCH ${DKR_ARCH:-armhf}
+ARG BALENA_ARCH
+ENV BALENA_ARCH ${BALENA_ARCH:-armhf}
 # RUN ["cross-build-start"]
 
-RUN printf "* %s VM, %s IMAGE" "$(arch)" "$DKR_ARCH"
+RUN printf "* %s VM, %s IMAGE" "$(arch)" "$BALENA_ARCH"
 
 # RUN ["cross-build-end"]
 

package/test/build/submodule/Dockerfile.x86_64

@@ -1,10 +1,10 @@
 ARG BALENA_MACHINE_NAME
 FROM balenalib/${BALENA_MACHINE_NAME:-intel-nuc}:latest
-ARG DKR_ARCH
-ENV DKR_ARCH ${DKR_ARCH:-x86_64}
+ARG BALENA_ARCH
+ENV BALENA_ARCH ${BALENA_ARCH:-x86_64}
 # RUN ["cross-build-start"]
 
-RUN printf "* %s VM, %s IMAGE" "$(arch)" "$DKR_ARCH"
+RUN printf "* %s VM, %s IMAGE" "$(arch)" "$BALENA_ARCH"
 
 # RUN ["cross-build-end"]
 

package/test/build/x86_64.env

@@ -1,4 +1,4 @@
-DKR_ARCH=x86_64
+BALENA_ARCH=x86_64
 BALENA_MACHINE_NAME=intel-nuc
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/intel-nuc

package/test/build-test.sh

@@ -9,47 +9,47 @@ LOG=$(new_log "/tmp")
 [ "$DEBUG" ] && LOG=$(new_log "/dev" "/stderr")
 function test_deploy() {
   # x86_64
-  args=("3" --nobuild --exit)
+  args=( "3" --nobuild --exit )
   # shellcheck disable=SC1090
   . "$vendord/balena_deploy.sh" "$testd" "${args[@]}" >> "$LOG"
   grep -q "intel-nuc" < "$testd/submodule/Dockerfile.x86_64"
 }
 function test_deploy_2() {
   # aarch64
-  args=("2" --nobuild --exit)
+  args=( "2" --nobuild --exit )
   # shellcheck disable=SC1090
   . "$vendord/balena_deploy.sh" "$testd" "${args[@]}" >> "$LOG"
   grep -q "generic-aarch64" < "$testd/submodule/Dockerfile.aarch64"
 }
 function test_deploy_3() {
   # armhf
-  args=("1" --nobuild --exit)
+  args=( "1" --nobuild --exit )
   # shellcheck disable=SC1090
   . "$vendord/balena_deploy.sh" "$testd" "${args[@]}" >> "$LOG"
   grep -q "raspberrypi3" < "$testd/submodule/Dockerfile.armhf"
 }
 function test_docker_3() {
-  args=("${testd}/submodule" -m . "betothreeprod/raspberrypi3" "$DKR_ARCH")
+  args=( "${testd}/submodule" -m . "betothreeprod/raspberrypi3" "$BALENA_ARCH" )
   # shellcheck disable=SC1090
   . "$vendord/docker_build.sh" "${args[@]}" >> "$LOG"
   docker image ls -q "${args[3]}*"
 }
 function test_docker() {
-  args=("${testd}/deployment/images/dind-php7" -m . "betothreeprod/dind-php7" "$DKR_ARCH")
+  args=( "${testd}/deployment/images/dind-php7" -m . "betothreeprod/dind-php7" "$BALENA_ARCH" )
   # shellcheck disable=SC1090
   . "$vendord/docker_build.sh" "${args[@]}" >> "$LOG"
   docker image ls -q "${args[3]}*"
 }
 test_deploy
-results=("$?")
+results=( "$?" )
 test_docker
-results+=("$?")
+results+=( "$?" )
 test_deploy_2
-results+=("$?")
+results+=( "$?" )
 test_deploy_3
-results+=("$?")
+results+=( "$?" )
 test_docker_3
-results+=("$?")
+results+=( "$?" )
 [ "$chkSet" = 'x' ] && unset DEBIAN_FRONTEND || DEBIAN_FRONTEND=${chkSet:2}
 check_log "$LOG"
 

package/vendor/cni/auto_reboot.sh

@@ -30,7 +30,7 @@ DAEMON_SVC="/usr/lib/systemd/system/$SVC_NAME.service.d/"
 [ -f $DAEMON_CF ] || touch "$DAEMON_CF"
 [ -d $DAEMON_SVC ] || mkdir -p "$DAEMON_SVC"
 
-banner=("" "[services.d] $DAEMON_SVC" ""); log_daemon_msg "%s\n" "${banner[@]}"
+banner=( "" "[services.d] $DAEMON_SVC" "" ); log_daemon_msg "%s\n" "${banner[@]}"
 
 DAEMON_CF="$DAEMON_CF $(find "$DAEMON_SVC" -name "*.conf")"
 for cnf in $DAEMON_CF; do

package/vendor/cni/balena_deploy.sh

@@ -3,7 +3,7 @@ set +u
 [ "$#" -eq 0 ] && echo "usage $0 <project_root|\${BASH_SOURCE[0]}> <args>" && exit 0
 [ -f "$1" ] && set -- "$(cd "$(dirname "$1")" && pwd)" "${@:2}"
 project_root="$(cd "$1" && pwd)"; shift
-banner=("" "[$0] BASH ${BASH_SOURCE[0]}" "$project_root" ""); printf "%s\n" "${banner[@]}"
+banner=( "" "[$0] BASH ${BASH_SOURCE[0]}" "$project_root" "" ); printf "%s\n" "${banner[@]}"
 
 # shellcheck source=init_functions.sh
 . "$(command -v init_functions)" "${BASH_SOURCE[0]}"
@@ -31,13 +31,13 @@ usage=("" \
 "                         6,--build-deps          Deployment images dependencies build." \
 "                         0,--exit                Quit script (non interactive)." \
 "" \
-"Deployment images        Set BALENA_PROJECTS=(./dir_one ./dir_two ./dir_three)" \
+"Deployment images        Set BALENA_PROJECTS=( ./dir_one ./dir_two ./dir_three )" \
 "                         in common.env file." \
-"Variable filters         Set BALENA_PROJECTS_FLAGS=(VAR_ONE VAR_TWO)" \
+"Variable filters         Set BALENA_PROJECTS_FLAGS=( VAR_ONE VAR_TWO )" \
 "                         in common.env" \
 "")
 arch=${1:-''}
-saved=("${@:2}")
+saved=( "${@:2}" )
 while true; do
   case $arch in
     1|arm32*|armv7l|armhf)
@@ -52,7 +52,7 @@ while true; do
     *)
       printf "%s\n" "${usage[@]}"
       if [ "${DEBIAN_FRONTEND:-}" = 'noninteractive' ]; then
-        arch=$(grep "DKR_ARCH" < "$project_root/.env"| cut -d= -f2)
+        arch=$(grep "BALENA_ARCH" < "$project_root/.env"| cut -d= -f2)
       else
         read -rp "Set docker machine architecture ARM32, ARM64 bits or X86-64 (choose 1, 2 or 3) ? " arch
       fi
@@ -60,28 +60,28 @@ while true; do
   esac
   log_progress_msg "Architecture $arch was selected"
 done
-DKR_ARCH=${arch}
-[ ! -f "$project_root/${DKR_ARCH}.env" ] && log_failure_msg "Missing arch file ${DKR_ARCH}.env" && exit 1
-ln -vsf "$project_root/${DKR_ARCH}.env" "$project_root/.env" >> "$LOG"
+BALENA_ARCH=${arch}
+[ ! -f "$project_root/${BALENA_ARCH}.env" ] && log_failure_msg "Missing arch file ${BALENA_ARCH}.env" && exit 1
+ln -vsf "$project_root/${BALENA_ARCH}.env" "$project_root/.env" >> "$LOG"
 # shellcheck disable=SC1090
 . "$project_root/.env" && . "$project_root/common.env"
 ### ADD ANY ENVIRONMENT VARIABLE TO BALENA_PROJECTS_FLAGS
-flags=()
+flags=(  )
 if [ -n "$BALENA_PROJECTS_FLAGS" ]; then
   log_daemon_msg "Found ${#BALENA_PROJECTS_FLAGS[@]} flags set BALENA_PROJECTS_FLAGS" >> "$LOG"
-  flags=("${BALENA_PROJECTS_FLAGS[@]}")
+  flags=( "${BALENA_PROJECTS_FLAGS[@]}" )
 fi
 function setArch() {
   while [ "$#" -gt 1 ]; do
     cat /dev/null > "$1.sed"
     sed=("s/%%BALENA_MACHINE_NAME%%/${BALENA_MACHINE_NAME}/g" \
-    "s/(Dockerfile\.)[^\.]*/\\1${DKR_ARCH}/g" \
-    "s/%%BALENA_ARCH%%/${DKR_ARCH}/g" \
-    "s/(DKR_ARCH[=:-]+)[^\$ }]+/\\1${DKR_ARCH}/g" )
+    "s/(Dockerfile\.)[^\.]*/\\1${BALENA_ARCH}/g" \
+    "s/%%BALENA_ARCH%%/${BALENA_ARCH}/g" \
+    "s/(BALENA_ARCH[=:-]+)[^\$ }]+/\\1${BALENA_ARCH}/g" )
     printf "%s\n" "${sed[@]}" >> "$1.sed"
     for flag in "${flags[@]}"; do
       flag_val=$(eval "echo \${$flag}")
-      sed=("s#(${flag}[=:-]+)[^\$ }]+#\\1${flag_val}#g" \
+      sed=( "s#(${flag}[=:-]+)[^\$ }]+#\\1${flag_val}#g" \
       "s#%%${flag}%%#${flag_val}#g" )
       printf "%s\n" "${sed[@]}" >> "$1.sed"
     done
@@ -89,16 +89,16 @@ function setArch() {
   shift 2; done
 }
 ### ADD ANY SUBMODULE DOCKER IMAGE / SERVICE TO BALENA_PROJECTS
-projects=(".")
+projects=( "." )
 if [ "${#BALENA_PROJECTS[@]}" -gt 0 ]; then
   log_daemon_msg "Found ${#BALENA_PROJECTS[@]} projects set BALENA_PROJECTS"  >> "$LOG"
-  projects=("${BALENA_PROJECTS[@]}")
+  projects=( "${BALENA_PROJECTS[@]}" )
 fi
 function deploy_deps() {
-  mapfile -t dock < <(find "${project_root}/deployment/images" -name "Dockerfile.${DKR_ARCH}")
+  mapfile -t dock < <(find "${project_root}/deployment/images" -name "Dockerfile.${BALENA_ARCH}")
   for d in "${dock[@]}"; do
     dir=$(dirname "$d")
-    docker_build "$dir" "." "$DOCKER_USER/$(basename "$dir")" "${DKR_ARCH}"
+    docker_build "$dir" "." "$DOCKER_USER/$(basename "$dir")" "${BALENA_ARCH}"
   done
 }
 ### ADD HERE ### A MARKER STARTS... ### A MARKER ENDS
@@ -123,8 +123,8 @@ function comment() {
       echo "/${ARM_BEGIN}/,/${ARM_END}/s/^[# ]*(.*)/# \\1/g" >> "$file.sed"
       ;;
     -c*|--cross)
-      sed=("s/[# ]*(${MARK_BEGIN})/# \\1/g" \
-      "s/[# ]*(${MARK_END})/# \\1/g")
+      sed=( "s/[# ]*(${MARK_BEGIN})/# \\1/g" \
+      "s/[# ]*(${MARK_END})/# \\1/g" )
       printf "%s\n" "${sed[@]}" >> "$file.sed"
       ;;
   esac; shift; done;
@@ -143,8 +143,8 @@ function uncomment() {
       echo "/${ARM_BEGIN}/,/${ARM_END}/s/^(# )+(.*)/\\2/g" >> "$file.sed"
       ;;
     -c*|--cross)
-      sed=("s/(# )+(${MARK_BEGIN})/\\2/g" \
-      "s/(# )+(${MARK_END})/\\2/g")
+      sed=( "s/(# )+(${MARK_BEGIN})/\\2/g" \
+      "s/(# )+(${MARK_END})/\\2/g" )
       printf "%s\n" "${sed[@]}" >> "$file.sed"
       ;;
   esac; shift; done;
@@ -166,31 +166,31 @@ function cross_build_start() {
     log_progress_msg "$MARK_BEGIN" >> "$LOG"
   fi
   for d in "${projects[@]}"; do
-    ln -vsf "$project_root/${DKR_ARCH}.env" "$project_root/$d/.env" >> "$LOG"
+    ln -vsf "$project_root/${BALENA_ARCH}.env" "$project_root/$d/.env" >> "$LOG"
     [ "$(cd "$project_root/$d" && pwd)" != "$(pwd)" ] && ln -vsf "$project_root/common.env" "$project_root/$d/common.env" >> "$LOG"
-    setArch "$project_root/$d/Dockerfile.template" "$project_root/$d/Dockerfile.${DKR_ARCH}"
+    setArch "$project_root/$d/Dockerfile.template" "$project_root/$d/Dockerfile.${BALENA_ARCH}"
     if [ "$crossbuild" = 0 ]; then
       if [ "$arch" != "x86_64" ]; then
-        comment "$project_root/$d/Dockerfile.${DKR_ARCH}" -c
-        uncomment "$project_root/$d/Dockerfile.${DKR_ARCH}" -a
-        uncomment "$project_root/docker-compose.${DKR_ARCH}" -a
+        comment "$project_root/$d/Dockerfile.${BALENA_ARCH}" -c
+        uncomment "$project_root/$d/Dockerfile.${BALENA_ARCH}" -a
+        uncomment "$project_root/docker-compose.${BALENA_ARCH}" -a
       else
-        comment "$project_root/$d/Dockerfile.${DKR_ARCH}"
-        comment "$project_root/docker-compose.${DKR_ARCH}"
+        comment "$project_root/$d/Dockerfile.${BALENA_ARCH}"
+        comment "$project_root/docker-compose.${BALENA_ARCH}"
       fi
     else
       if [ "$arch" != "x86_64" ]; then
-        uncomment "$project_root/docker-compose.${DKR_ARCH}"
-        uncomment "$project_root/$d/Dockerfile.${DKR_ARCH}"
+        uncomment "$project_root/docker-compose.${BALENA_ARCH}"
+        uncomment "$project_root/$d/Dockerfile.${BALENA_ARCH}"
       else
-        comment "$project_root/docker-compose.${DKR_ARCH}"
-        comment "$project_root/$d/Dockerfile.${DKR_ARCH}"
+        comment "$project_root/docker-compose.${BALENA_ARCH}"
+        comment "$project_root/$d/Dockerfile.${BALENA_ARCH}"
       fi
     fi
-    [ "$(cd "$project_root/$d" && pwd)" != "$(pwd)" ] && cd "$project_root/$d" && git_commit "${DKR_ARCH} pushed ${d}"
+    [ "$(cd "$project_root/$d" && pwd)" != "$(pwd)" ] && cd "$project_root/$d" && git_commit "${BALENA_ARCH} pushed ${d}"
     cd "$project_root" || return
   done
-  git_commit "${DKR_ARCH} pushed"
+  git_commit "${BALENA_ARCH} pushed"
 }
 function git_commit() {
   if ! git config user.email > /dev/null; then
@@ -202,16 +202,16 @@ function git_commit() {
 }
 function native_compose_file_set() {
   if [ "$#" -gt 0 ]; then
-    setArch "$project_root/docker-compose.template" "$project_root/docker-compose.${DKR_ARCH}"
+    setArch "$project_root/docker-compose.template" "$project_root/docker-compose.${BALENA_ARCH}"
     cp -vf "$project_root/docker-compose.$1" "$project_root/docker-compose.yml"
   else
-    native_compose_file_set "${DKR_ARCH}"
+    native_compose_file_set "${BALENA_ARCH}"
   fi
 }
 function balena_push() {
-  apps=("$#")
+  apps=( "$#" )
   i=0
-  [ "$#" -gt 0 ] && for a in "$@"; do apps+=("$a"); done
+  [ "$#" -gt 0 ] && for a in "$@"; do apps+=( "$a" ); done
   for a in "${!apps[@]}"; do
     [ "$a" = 0 ] && continue
     printf "[%s]: %s " "$a" "${apps[$a]}"
@@ -246,11 +246,11 @@ while true; do
     4|--docker)
       slogger -st docker "Allow cross-build"
       cross_build_start
-      file=docker-compose.${DKR_ARCH}
+      file=docker-compose.${BALENA_ARCH}
       if [ -f "$file" ]; then
         bash -c "docker-compose -f $file --host ${DOCKER_HOST:-''} build"  >> "$LOG"
       else
-        bash -c "docker build -f Dockerfile.${DKR_ARCH} . && docker ps"  >> "$LOG"
+        bash -c "docker build -f Dockerfile.${BALENA_ARCH} . && docker ps"  >> "$LOG"
       fi
       ;;
     2|--balena)

package/vendor/cni/docker_build.sh

@@ -3,21 +3,21 @@ set -u
 [ "$#" -eq 0 ] && echo "usage $0 <work_dir> <args>" && exit 0
 [ -f "$1" ] && set -- "$(cd "$(dirname "$1")" && pwd)" "${@:2}"
 workd="$(cd "$1" && pwd)"; shift
-banner=("" "[$0] BASH ${BASH_SOURCE[0]}" "$workd" ""); printf "%s\n" "${banner[@]}"
+banner=( "" "[$0] BASH ${BASH_SOURCE[0]}" "$workd" "" ); printf "%s\n" "${banner[@]}"
 [ "${DEBUG:-0}" != 0 ] && printf "passed arg %s\n" "$*"
 usage=("" \
-"Usage: $0 [options] <work_sub_dir> <container_name> [DKR_ARCH]" \
+"Usage: $0 [options] <work_sub_dir> <container_name> [BALENA_ARCH]" \
 "                    <-f, --force> <-e> <-m, --make-space>" \
 "" \
 "                    Base balenalib/raspberrypi3 images may be" \
 "                    built from a Mac or PC without any specific" \
-"                    cross-build backend, just set DKR_ARCH to ARM32" \
+"                    cross-build backend, just set BALENA_ARCH to ARM32" \
 "                    or ARM64." \
 "" \
 "          work_sub_dir:    Path relative to $0" \
 "          container_name:  Set to username/container to push to" \
 "                           Docker.io, e.g. myself/cakephp2-image x86_64" \
-"          DKR_ARCH:        1|arm32*|armv7l|armhf   ARMv7 OS" \
+"          BALENA_ARCH:        1|arm32*|armv7l|armhf   ARMv7 OS" \
 "                           2|arm64*|aarch64        ARMv8 OS" \
 "                           3|amd64|x86_64          All X86 64 bits" \
 "                                                   OS (Mac or PC)" \
@@ -25,7 +25,7 @@ usage=("" \
 "          -e:              Reset docker machine environment variables" \
 "          -m,--make-space: Remove exited containers to free some disk space" \
 "          TAG:             Set as environment variable IMG_TAG" \
-"                           File <DKR_ARCH>.env" \
+"                           File <BALENA_ARCH>.env" \
 "More about docker tag:" \
 "       docker tag <repository/image:tag> <new_repository/new_image:tag>" \
 "")
@@ -45,13 +45,13 @@ while [[ "$#" -gt 0 ]]; do case $1 in
   *)
     DIR="$1"
     NAME=$(echo "$2" | cut -d: -f1)
-    DKR_ARCH="$3"
+    BALENA_ARCH="$3"
     shift 2
     ;;
 esac; shift; done
 # shellcheck disable=SC1090
 . "${workd}/.env" && . "${workd}/common.env"
-docker build -f "$workd/$DIR/Dockerfile.${DKR_ARCH}" -t "$NAME:$IMG_TAG" "$workd/$DIR"
+docker build -f "$workd/$DIR/Dockerfile.${BALENA_ARCH}" -t "$NAME:$IMG_TAG" "$workd/$DIR"
 container=$(echo "$NAME" | cut -d/ -f2-)
 docker run --rm -itd --name "$container" "$NAME:$IMG_TAG" &
 sleep 2
@@ -59,5 +59,5 @@ container="$(docker ps -q -a -f "name=$container")"
 [ "$container" ] && docker stop "$container"
 docker login docker.io -u "${DOCKER_USER:-}" -p "${DOCKER_PASS:-}"
 docker push "$NAME:$IMG_TAG"
-docker tag "$NAME:$IMG_TAG" "$NAME:$IMG_TAG-${DKR_ARCH}"
-docker push "$NAME:$IMG_TAG-${DKR_ARCH}"
+docker tag "$NAME:$IMG_TAG" "$NAME:$IMG_TAG-${BALENA_ARCH}"
+docker push "$NAME:$IMG_TAG-${BALENA_ARCH}"

package/vendor/cni/init_functions.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 [ "$#" -eq 0 ] && echo "usage $0 \${BASH_SOURCE[0]} <args>" && exit 0
-banner=("" "[$0] BASH ${BASH_SOURCE[0]}" ""); printf "%s\n" "${banner[@]}"
+banner=( "" "[$0] BASH ${BASH_SOURCE[0]}" "" ); printf "%s\n" "${banner[@]}"
 function log_daemon_msg() {
   printf "* %s\n" "$@"
 }

package/vendor/cni/post_install.sh

@@ -7,6 +7,6 @@ read -r -a BALENA_PROJECTS < <(find . -name "Dockerfile*" | awk -F"/Dockerfile"
 printf "Found %s BALENA_PROJECTS(" "${#BALENA_PROJECTS}"
 printf "%s " "${BALENA_PROJECTS[@]}"
 printf " )\n"
-sed -i.old -E -e "s#(BALENA_PROJECTS)=(.*))#\\1=\(${BALENA_PROJECTS[*]}\) \#\\2#" common.env
+sed -i.old -E -e "s#(BALENA_PROJECTS)=(.*))#\\1=\( ${BALENA_PROJECTS[*]} \) \#\\2#" common.env
 cat common.env
 printf "Ready to <( balena_deploy . \n"

package/x86_64.env

@@ -1,4 +1,4 @@
-DKR_ARCH=x86_64
+BALENA_ARCH=x86_64
 BALENA_MACHINE_NAME=intel-nuc
 IMG_TAG=latest
 PRIMARY_HUB=betothreeprod\\/intel-nuc