16306: Add --os argument to package build scripts.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/cmd/arvados-dev/docker-boot.sh b/cmd/arvados-dev/docker-boot.sh
index 7eca33e79944629ae8a20073cef71ebd86b92109..39a8a56c8aa93192dfc6a2458b0a1b9817da3f52 100755 (executable)
--- a/cmd/arvados-dev/docker-boot.sh
+++ b/cmd/arvados-dev/docker-boot.sh
@@ -19,6 +19,11 @@ set -e -o pipefail
 declare -A opts=()
 while [[ $# -gt 0 ]]; do
     case "$1" in
+        --os)
+            shift
+            opts[os]="$1"
+            shift
+            ;;
         --shell)
             shift
             opts[shell]=1
@@ -54,7 +59,7 @@ for inject in "$@"; do
     esac
 done
 
-osbase=debian:10
+osbase=${opts[os]:-debian:10}
 installimage=arvados-installpackage-${osbase}
 command="/var/lib/arvados/bin/arvados-server boot -listen-host 0.0.0.0"
 if [[ "${opts[shell]}" ]]; then

diff --git a/cmd/arvados-dev/docker-build-install.sh b/cmd/arvados-dev/docker-build-install.sh
index 63b5b5c2d4271ddbef158d96f36cbf7070dcf5a1..78b08d7dc3758cb3f8c2d77160da0b2cf4a8df82 100755 (executable)
--- a/cmd/arvados-dev/docker-build-install.sh
+++ b/cmd/arvados-dev/docker-build-install.sh
@@ -25,6 +25,10 @@ while [[ $# -gt 0 ]]; do
         --force-installimage)
             opts[force-installimage]=1
             ;;
+        --os)
+            opts[os]="$1"
+            shift
+            ;;
         *)
             echo >&2 "invalid argument '$arg'"
             exit 2
@@ -43,7 +47,7 @@ cleanup() {
 trap cleanup ERR EXIT
 
 version=$(git describe --tag --dirty)
-osbase=debian:10
+osbase=${opts[os]:-debian:10}
 
 mkdir -p /tmp/pkg