From 5cc322cc84c96c71bd463d66fd0314d9bf4a61bd Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 5 Feb 2020 18:41:29 -0800
Subject: [PATCH] Add build scripts and pull in debian via bind mount

---
 .gitignore                                         |  1 +
 Dockerfile.buster.amd64 => Dockerfile.amd64.buster |  1 -
 Dockerfile.l4t.bionic                              |  1 -
 Dockerfile.rpi.buster                              |  1 -
 build-amd64.sh                                     | 11 +++++++++++
 build-l4t.sh                                       | 11 +++++++++++
 build-rpi.sh                                       | 11 +++++++++++
 7 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore
 rename Dockerfile.buster.amd64 => Dockerfile.amd64.buster (96%)
 create mode 100755 build-amd64.sh
 create mode 100755 build-l4t.sh
 create mode 100755 build-rpi.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8efda6f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+out_*/
\ No newline at end of file
diff --git a/Dockerfile.buster.amd64 b/Dockerfile.amd64.buster
similarity index 96%
rename from Dockerfile.buster.amd64
rename to Dockerfile.amd64.buster
index 1ea2bad..ab29cbd 100644
--- a/Dockerfile.buster.amd64
+++ b/Dockerfile.amd64.buster
@@ -15,7 +15,6 @@ COPY scripts/build-deps.sh /opt/scripts/
 RUN /bin/bash -c /opt/scripts/build-deps.sh
 
 COPY scripts/build-package.sh /opt/scripts/
-COPY debian /opt/debian
 
 VOLUME "/out"
 ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-package.sh" ]
diff --git a/Dockerfile.l4t.bionic b/Dockerfile.l4t.bionic
index 889ffcb..7467091 100644
--- a/Dockerfile.l4t.bionic
+++ b/Dockerfile.l4t.bionic
@@ -15,7 +15,6 @@ COPY FFmpeg /opt/FFmpeg
 
 COPY scripts/build-deps.sh /opt/scripts/
 COPY scripts/build-package.sh /opt/scripts/
-COPY debian /opt/debian
 
 VOLUME "/out"
 ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-deps.sh && /opt/scripts/build-package.sh" ]
diff --git a/Dockerfile.rpi.buster b/Dockerfile.rpi.buster
index 24313fe..8a42e75 100644
--- a/Dockerfile.rpi.buster
+++ b/Dockerfile.rpi.buster
@@ -18,7 +18,6 @@ COPY scripts/build-deps.sh /opt/scripts/
 RUN /bin/bash -c /opt/scripts/build-deps.sh
 
 COPY scripts/build-package.sh /opt/scripts/
-COPY debian /opt/debian
 
 VOLUME "/out"
 ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-package.sh" ]
diff --git a/build-amd64.sh b/build-amd64.sh
new file mode 100755
index 0000000..f20f497
--- /dev/null
+++ b/build-amd64.sh
@@ -0,0 +1,11 @@
+TAG_NAME="amd64-buster"
+OUT_DIR="out_$TAG_NAME"
+DOCKERFILE="Dockerfile.amd64.buster"
+
+rm -rf $OUT_DIR
+
+set -e
+mkdir $OUT_DIR
+
+docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+docker run -it --rm --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian cgutman/moonlight-packaging:$TAG_NAME
\ No newline at end of file
diff --git a/build-l4t.sh b/build-l4t.sh
new file mode 100755
index 0000000..8a1c9e2
--- /dev/null
+++ b/build-l4t.sh
@@ -0,0 +1,11 @@
+TAG_NAME="l4t-bionic"
+OUT_DIR="out_$TAG_NAME"
+DOCKERFILE="Dockerfile.l4t.bionic"
+
+rm -rf $OUT_DIR
+
+set -e
+mkdir $OUT_DIR
+
+docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+docker run -it --rm --runtime nvidia --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian cgutman/moonlight-packaging:$TAG_NAME
\ No newline at end of file
diff --git a/build-rpi.sh b/build-rpi.sh
new file mode 100755
index 0000000..c00ac24
--- /dev/null
+++ b/build-rpi.sh
@@ -0,0 +1,11 @@
+TAG_NAME="rpi-buster"
+OUT_DIR="out_$TAG_NAME"
+DOCKERFILE="Dockerfile.rpi.buster"
+
+rm -rf $OUT_DIR
+
+set -e
+mkdir $OUT_DIR
+
+docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+docker run -it --rm --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian cgutman/moonlight-packaging:$TAG_NAME
\ No newline at end of file