From 5cc00be801354d85b48f38d5028ff1f3bee77564 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 10 Dec 2018 13:10:59 -0800
Subject: [PATCH] Switch to shell script for docker encapsulation, forward env
 variables

---
 android/containerized_build.sh  | 22 ++++++++++++++++++++++
 android/{ => docker}/Dockerfile |  0
 2 files changed, 22 insertions(+)
 create mode 100755 android/containerized_build.sh
 rename android/{ => docker}/Dockerfile (100%)

diff --git a/android/containerized_build.sh b/android/containerized_build.sh
new file mode 100755
index 0000000000..cd6f15a92e
--- /dev/null
+++ b/android/containerized_build.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+
+DOCKER_IMAGE_NAME="hifi_androidbuild"
+
+docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f docker/Dockerfile docker
+
+docker run \
+   --rm \
+    --security-opt seccomp:unconfined \
+   -v "${WORKSPACE}":/home/jenkins/hifi \
+   -e "RELEASE_NUMBER=${RELEASE_NUMBER}" \
+   -e "RELEASE_TYPE=${RELEASE_TYPE}" \
+   -e "ANDROID_BUILD_TARGET=assembleDebug" \
+   -e "CMAKE_BACKTRACE_URL=${CMAKE_BACKTRACE_URL}" \
+   -e "CMAKE_BACKTRACE_TOKEN=${CMAKE_BACKTRACE_TOKEN}" \
+   -e "CMAKE_BACKTRACE_SYMBOLS_TOKEN=${CMAKE_BACKTRACE_SYMBOLS_TOKEN}" \
+   -e "GA_TRACKING_ID=${GA_TRACKING_ID}" \
+   -e "GIT_PR_COMMIT=${GIT_PR_COMMIT}" \
+   -e "VERSION_CODE=${VERSION_CODE}" \
+   "${DOCKER_IMAGE_NAME}" \
+   sh -c "./build_android.sh"
diff --git a/android/Dockerfile b/android/docker/Dockerfile
similarity index 100%
rename from android/Dockerfile
rename to android/docker/Dockerfile