Merge branch 'add-container-helper-script'

2 files changed, 62 insertions, 31 deletions

diff --git a/building/container-run.sh b/building/container-run.sh
new file mode 100755
index 0000000000..eaaa115149
--- /dev/null
+++ b/building/container-run.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Gives you a shell or runs a given command in the Android or Linux build container,
+# as designated by the *-container-image.txt files. Uses podman unless overridden using the
+# environment variable `CONTAINER_RUNNER`. Note that this script uses named
+# docker volumes that can be overridden using enviornment variables (see the
+# beginning of the script).
+#
+# Usage: $ container-run.sh <linux/android> [command ...]
+#
+# Not supplying any command gives you a shell in the container.
+
+set -eu
+
+REPO_MOUNT_TARGET="/build"
+CARGO_TARGET_VOLUME_NAME=${CARGO_TARGET_VOLUME_NAME:-"cargo-target"}
+CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"}
+GRADLE_CACHE_VOLUME_NAME=${GRADLE_CACHE_VOLUME_NAME:-"gradle-cache"}
+ANDROID_CREDENTIALS_DIR=${ANDROID_CREDENTIALS_DIR:-""}
+CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"}
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
+cd "$SCRIPT_DIR"
+
+source "$REPO_DIR/scripts/utils/log"
+
+case ${1-:""} in
+    linux)
+        container_image_name=$(cat "$SCRIPT_DIR/linux-container-image.txt")
+        shift 1
+    ;;
+    android)
+        container_image_name=$(cat "$SCRIPT_DIR/android-container-image.txt")
+        optional_gradle_cache_volume=(-v "$GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z")
+
+        if [ -n "$ANDROID_CREDENTIALS_DIR" ]; then
+            optional_android_credentials_volume=(-v "$ANDROID_CREDENTIALS_DIR:$REPO_MOUNT_TARGET/android/credentials:Z")
+        fi
+
+        shift 1
+    ;;
+    *)
+        log_error "Invalid platform. Specify 'linux' or 'android' as first argument"
+        exit 1
+esac
+
+set -x
+exec "$CONTAINER_RUNNER" run --rm -it \
+    -v "$REPO_DIR:$REPO_MOUNT_TARGET:Z" \
+    -v "$CARGO_TARGET_VOLUME_NAME:/root/.cargo/target:Z" \
+    -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \
+    "${optional_gradle_cache_volume[@]}" \
+    "${optional_android_credentials_volume[@]}" \
+    "$container_image_name" "$@"
diff --git a/building/containerized-build.sh b/building/containerized-build.sh
index 32b75df116..dd8bf17fa8 100755
--- a/building/containerized-build.sh
+++ b/building/containerized-build.sh
@@ -1,41 +1,24 @@
 #!/usr/bin/env bash
 
-# Builds the Android or Linux app in the current build container, as designated
-# by the *-container-image.txt files. Uses podman unless overridden using the
-# environment variable `CONTAINER_RUNNER`. Note that this script uses named
-# docker volumes that can be overridden using enviornment variables (see the
-# beginning of the script).
+# Builds the Android or Linux app in the current build container.
+# See the `container-run.sh` script for possible configuration.
 
 set -eu
 
-REPO_MOUNT_TARGET="/build"
-CARGO_TARGET_VOLUME_NAME=${CARGO_TARGET_VOLUME_NAME:-"cargo-target"}
-CARGO_REGISTRY_VOLUME_NAME=${CARGO_REGISTRY_VOLUME_NAME:-"cargo-registry"}
-GRADLE_CACHE_VOLUME_NAME=${GRADLE_CACHE_VOLUME_NAME:-"gradle-cache"}
-ANDROID_CREDENTIALS_DIR=${ANDROID_CREDENTIALS_DIR:-""}
-CONTAINER_RUNNER=${CONTAINER_RUNNER:-"podman"}
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
 cd "$SCRIPT_DIR"
 
 source "$REPO_DIR/scripts/utils/log"
 
-case ${1-:""} in
+platform=${1-:""}
+case $platform in
     linux)
-        container_image_name=$(cat "$SCRIPT_DIR/linux-container-image.txt")
-        build_command=("$REPO_MOUNT_TARGET/build.sh")
+        build_command=("./build.sh")
         shift 1
     ;;
     android)
-        container_image_name=$(cat "$SCRIPT_DIR/android-container-image.txt")
-        build_command=("$REPO_MOUNT_TARGET/build-apk.sh" "--no-docker")
-        optional_gradle_cache_volume=(-v "$GRADLE_CACHE_VOLUME_NAME:/root/.gradle:Z")
-
-        if [ -n "$ANDROID_CREDENTIALS_DIR" ]; then
-            optional_android_credentials_volume=(-v "$ANDROID_CREDENTIALS_DIR:$REPO_MOUNT_TARGET/android/credentials:Z")
-        fi
-
+        build_command=("./build-apk.sh" "--no-docker")
         shift 1
     ;;
     *)
@@ -44,11 +27,4 @@ case ${1-:""} in
 esac
 
 set -x
-exec "$CONTAINER_RUNNER" run --rm -it \
-    -v "$REPO_DIR:$REPO_MOUNT_TARGET:Z" \
-    -v "$CARGO_TARGET_VOLUME_NAME:/root/.cargo/target:Z" \
-    -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \
-    "${optional_gradle_cache_volume[@]}" \
-    "${optional_android_credentials_volume[@]}" \
-    "$container_image_name" \
-    "${build_command[@]}" "$@"
+exec "$SCRIPT_DIR/container-run.sh" "$platform" "${build_command[@]}" "$@"