balena-cloud-apps 1.0.41 → 1.0.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/vendor/cni/docker_build.sh +10 -5
  3. package/test/build/deployment/images/dind-php7/common.env +0 -1
  4. package/test/build/submodule/common.env +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "balena-cloud-apps",
3
- "version": "1.0.41",
3
+ "version": "1.0.43",
4
4
  "description": "Shell scripts package to the containers native interface BalenaOS for the Raspberry Pi.",
5
5
  "main": "index.js",
6
6
  "directories": {
package/vendor/cni/docker_build.sh CHANGED
@@ -6,7 +6,7 @@ workd="$(cd "$1" && pwd)"; shift
6
6
  banner=( "" "[$0] BASH ${BASH_SOURCE[0]}" "$workd" "" ); printf "%s\n" "${banner[@]}"
7
7
  [ "${DEBUG:-0}" != 0 ] && printf "passed arg %s\n" "$*"
8
8
  usage=("" \
9
- "Usage: $0 [options] <work_sub_dir> <container_name> [BALENA_ARCH]" \
9
+ "Usage: $0 [options] <work_dir> <work_sub_dir> <container_name>:[IMG_TAG] [BALENA_ARCH]" \
10
10
  " <-f, --force> <-e> <-m, --make-space>" \
11
11
  "" \
12
12
  " Base balenalib/raspberrypi3 images may be" \
@@ -17,17 +17,20 @@ usage=("" \
17
17
  " work_sub_dir: Path relative to $0" \
18
18
  " container_name: Set to username/container to push to" \
19
19
  " Docker.io, e.g. myself/cakephp2-image x86_64" \
20
+ " IMG_TAG: Set as environment variable IMG_TAG" \
21
+ " File <BALENA_ARCH>.env" \
20
22
  " BALENA_ARCH: 1|arm32*|armv7l|armhf ARMv7 OS" \
21
23
  " 2|arm64*|aarch64 ARMv8 OS" \
22
24
  " 3|amd64|x86_64 All X86 64 bits" \
23
25
  " OS (Mac or PC)" \
26
+ "More about docker tag:" \
27
+ " docker tag <repository/image:tag> <new_repository/new_image:tag>" \
28
+ "" \
29
+ " Available options:" \
24
30
  " -f,--force: Set docker daemon restart flag on" \
25
31
  " -e: Reset docker machine environment variables" \
26
32
  " -m,--make-space: Remove exited containers to free some disk space" \
27
- " TAG: Set as environment variable IMG_TAG" \
28
- " File <BALENA_ARCH>.env" \
29
- "More about docker tag:" \
30
- " docker tag <repository/image:tag> <new_repository/new_image:tag>" \
33
+ " -h,--help: This help" \
31
34
  "")
32
35
  [ "$#" -lt 3 ] && printf "%s\n" "${usage[@]}" && exit 0
33
36
  while [[ "$#" -gt 0 ]]; do case $1 in
@@ -45,7 +48,9 @@ while [[ "$#" -gt 0 ]]; do case $1 in
45
48
  *)
46
49
  DIR="$1"
47
50
  NAME=$(echo "$2" | cut -d: -f1)
51
+ TAG=$(echo "$2" | cut -d: -f2)
48
52
  BALENA_ARCH="$3"
53
+ IMG_TAG=${IMG_TAG:-"$TAG"}
49
54
  shift 2
50
55
  ;;
51
56
  esac; shift; done
package/test/build/deployment/images/dind-php7/common.env DELETED
@@ -1 +0,0 @@
1
- /mnt/c/Users/FORMATEUR/Documents/GitHub/balena-cloud-apps/test/build/common.env
package/test/build/submodule/common.env DELETED
@@ -1 +0,0 @@
1
- /mnt/c/Users/FORMATEUR/Documents/GitHub/balena-cloud-apps/test/build/common.env