From 27b7683be908ab4d452ba66cf50d9d9bbfce576c Mon Sep 17 00:00:00 2001
From: Jack Yu <yiyaoyu@cs.ucla.edu>
Date: Mon, 29 Apr 2024 17:52:17 -0700
Subject: [PATCH 1/3] Added pyspark version

---
 Makefile       | 17 +++++++++++++----
 README.md      |  9 ++++++++-
 with-spark.def | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 with-spark.def

diff --git a/Makefile b/Makefile
index c833f9f..b941ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,22 @@ UID := $(shell id -u)
 mobileinsight.sif: mobileinsight.def
 	"$(APPTAINER)" build --build-arg="NUM_THREADS=$(NUM_THREADS)" "$@" "$<"
 
-run: mobileinsight.sif
+mobileinsight-spark.sif: with-spark.def mobileinsight.sif
+	"$(APPTAINER)" build "$@" "$<"
+
+prepare:
 	@mkdir -p "$(OVERLAY_DIR)"
 	@lsmod | grep overlay > /dev/null || sudo modprobe overlay
+
+run: mobileinsight.sif prepare
 	@$(APPTAINER) run --overlay "$(OVERLAY_DIR)" \
 		-B "/run/user/$(UID)" mobileinsight.sif
 
-clean:
-	rm -f mobileinsight.sif $(OVERLAY_DIR)
+run-spark: mobileinsight-spark.sif prepare
+	@$(APPTAINER) run --overlay "$(OVERLAY_DIR)" \
+		-B "/run/user/$(UID)" mobileinsight-spark.sif
 
-.PHONY: run clean
+clean:
+	rm -rf *.sif $(OVERLAY_DIR)
+
+.PHONY: prepare run run-spark clean
diff --git a/README.md b/README.md
index 992b247..8baca2a 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,11 @@ $ ./mobileinsight.sif python3 "$PYTHON_ARGS"
 
 # Start a bash shell inside the container
 $ ./mobileinsight.sif bash
+
+# Only available in spark version
+#
+# Start a pyspark interpreter
+$ ./mobileinsight-spark.sif pyspark
 ```
 
 Examples are stored in /opt/mobileinsight-examples.
@@ -36,4 +41,6 @@ Examples are stored in /opt/mobileinsight-examples.
 Build
 -----
 
-Run `make mobileinsight.sif` to build the apptainer image.
+Run `make mobileinsight.sif` or `make mobileinsight-spark.sif` to build the
+apptainer image. The spark version includes both `mobileinsight` along with
+`pyspark`.
diff --git a/with-spark.def b/with-spark.def
new file mode 100644
index 0000000..101bed4
--- /dev/null
+++ b/with-spark.def
@@ -0,0 +1,32 @@
+Bootstrap: localimage
+From: mobileinsight.sif
+
+%arguments
+    SPARK_URL="https://dlcdn.apache.org/spark/spark-3.5.1/spark-3.5.1-bin-hadoop3.tgz"
+
+%environment
+    export SPARK_HOME="/opt/spark"
+    export PATH="/opt/spark/sbin:/opt/spark/bin:$PATH"
+    export PYSPARK_PYTHON="/usr/bin/python3"
+    export SPARK_LOCAL_IP="127.0.0.1"
+
+%post
+    # Update and install dependencies
+    mkdir -p /build
+    export DEBIAN_FRONTEND=noninteractive
+    apt-get update
+    apt-get upgrade -y
+    apt-get install -y \
+        openjdk-8-jre-headless \
+        scala
+
+    # Download Spark
+    SPARK_TGZ="/build/$(basename "{{ SPARK_URL }}")"
+    cd /build
+    wget "{{ SPARK_URL }}" -nv -O "$SPARK_TGZ"
+    tar -xf "$SPARK_TGZ"
+    mv "$(echo $SPARK_TGZ | sed 's/\.tgz$//')" /opt/spark
+
+    # Cleanup
+    apt-get autoclean -y
+    rm -rf /build

From 8b4c305300c16fa057646f18dca886a65c9de055 Mon Sep 17 00:00:00 2001
From: Jack Yu <yiyaoyu@cs.ucla.edu>
Date: Tue, 30 Apr 2024 11:32:28 -0700
Subject: [PATCH 2/3] Added venv support

---
 mobileinsight.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobileinsight.def b/mobileinsight.def
index 4b0d801..84b3263 100644
--- a/mobileinsight.def
+++ b/mobileinsight.def
@@ -19,6 +19,7 @@ From: ubuntu:22.04
             git \
             python3 \
             python3-pip \
+            python3-venv \
             python3-wxgtk4.0 \
             python3-matplotlib \
             cmake \

From cdd99b3280d8533eeea358a5e56d45811bf3fa68 Mon Sep 17 00:00:00 2001
From: Jack Yu <yiyaoyu@cs.ucla.edu>
Date: Tue, 30 Apr 2024 11:33:03 -0700
Subject: [PATCH 3/3] Updated README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8baca2a..a444d97 100644
--- a/README.md
+++ b/README.md
@@ -42,5 +42,5 @@ Build
 -----
 
 Run `make mobileinsight.sif` or `make mobileinsight-spark.sif` to build the
-apptainer image. The spark version includes both `mobileinsight` along with
-`pyspark`.
+corresponding apptainer image. The spark version includes both `mobileinsight`
+along with `pyspark` for distributed log processing.