From 7bdd0a78bc5956a25eff785b0e4745c8b6ebebf7 Mon Sep 17 00:00:00 2001
From: myve <forge@myvelabs.com>
Date: Tue, 23 Jul 2024 20:11:47 -0600
Subject: [PATCH] Propagate to new format

---
 firefox/{firefox.sh => 20-firefox.sh} | 33 ----------------------
 firefox/Dockerfile                    | 18 ++++++++++++
 firefox/up                            | 27 ++++++++++++++++++
 i3/{i3.sh => 10-tigervnc.sh}          | 40 ---------------------------
 i3/90-tigervnc.sh                     |  3 ++
 i3/Dockerfile                         | 22 +++++++++++++++
 i3/build                              |  7 +++++
 7 files changed, 77 insertions(+), 73 deletions(-)
 rename firefox/{firefox.sh => 20-firefox.sh} (73%)
 mode change 100644 => 100755
 create mode 100644 firefox/Dockerfile
 create mode 100755 firefox/up
 rename i3/{i3.sh => 10-tigervnc.sh} (66%)
 mode change 100644 => 100755
 create mode 100755 i3/90-tigervnc.sh
 create mode 100644 i3/Dockerfile
 create mode 100755 i3/build

diff --git a/firefox/firefox.sh b/firefox/20-firefox.sh
old mode 100644
new mode 100755
similarity index 73%
rename from firefox/firefox.sh
rename to firefox/20-firefox.sh
index 9529a1f..3935a23
--- a/firefox/firefox.sh
+++ b/firefox/20-firefox.sh
@@ -1,30 +1,3 @@
-## Dockerfile
-cat >Dockerfile <<- 'Dockerfile'
-# syntax = docker/dockerfile:1.2
-FROM myvnc/base:i3
-USER root
-
-# # ENV variables
-# ENV MYVNC_FIREFOX_URL   # optional
-# ENV MYVNC_FIREFOX_OPTS  # eg, --kiosk
- 
-# Install packages
-RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
-    pacman -Syu --ask 4 --needed \
-    firefox firefox-decentraleyes firefox-ublock-origin \
-    && pacman -Scc --ask 4
-
-# Tigervnc
-COPY 20-firefox.sh /app/init.d/
-RUN chmod +x /app/init.d/*
-
-# Reset user home directory
-USER user
-WORKDIR /home/user
-Dockerfile
-
-## Firefox setup
-cat >20-firefox.sh <<- 'entrypoint'
 #!/usr/bin/env bash
 # Create firefox profile directory
 mkdir -p /app/firefox
@@ -81,9 +54,3 @@ do
     /usr/bin/firefox --profile /app/firefox ${MYVNC_FIREFOX_OPTS} --new-window ${MYVNC_FIREFOX_URL}
 done
 startup
-entrypoint
-
-## Docker build
-DOCKER_BUILDKIT=1 docker build ./. \
-    --tag myvnc/firefox \
-    && rm -f Dockerfile *.sh
\ No newline at end of file
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
new file mode 100644
index 0000000..00593b9
--- /dev/null
+++ b/firefox/Dockerfile
@@ -0,0 +1,18 @@
+# syntax = docker/dockerfile:1.2
+FROM myvnc/arch/base:i3
+USER root
+
+# Build ARG: use "root" for debugging
+ARG debug
+ 
+# Install packages
+RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
+    pacman -Syu --ask 4 --needed \
+    firefox firefox-decentraleyes firefox-ublock-origin \
+    && pacman -Scc --ask 4
+
+# Tigervnc
+COPY *.sh /app/init.d/
+
+# Default environment
+USER ${debug:-user}
diff --git a/firefox/up b/firefox/up
new file mode 100755
index 0000000..fac9971
--- /dev/null
+++ b/firefox/up
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Docker build
+# Optional buildtag
+# DOCKER_BUILDKIT=1 \
+# docker build . \
+#     --build-arg debug=${debug:-""} \
+#     --tag ${buildtag:-myvnc/novnc}
+# Grab options
+while [ ${1} ]
+do
+    case ${1} in
+        -b | --build | b | build )
+            build="--build"
+            ;;
+        -d | --detach | d | detach )
+            detach="--detach"
+            ;;
+        bd | db )
+            build="--build"
+            detach="--detach"
+            ;;
+    esac
+    shift
+done
+
+# Compose up
+docker compose up ${build} ${detach}
diff --git a/i3/i3.sh b/i3/10-tigervnc.sh
old mode 100644
new mode 100755
similarity index 66%
rename from i3/i3.sh
rename to i3/10-tigervnc.sh
index 84f3b6b..a01ad1e
--- a/i3/i3.sh
+++ b/i3/10-tigervnc.sh
@@ -1,30 +1,3 @@
-## Dockerfile
-cat >Dockerfile <<- 'Dockerfile'
-# syntax = docker/dockerfile:1.2
-FROM myvnc/base
-USER root
-
-# X session environment variable
-ENV STARTXBIN i3
-
-# Install packages
-RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
-    pacman -Syu --ask 4 --needed \
-    tigervnc \
-    i3-wm ttf-dejavu \
-    && pacman -Scc --ask 4
-
-# i3
-COPY 10-tigervnc.sh 90-tigervnc.sh /app/init.d/
-RUN chmod +x /app/init.d/*
-
-# Reset user home directory
-USER user
-WORKDIR /home/user
-Dockerfile
-
-## i3/tigervnc Setup
-cat >10-tigervnc.sh <<- '10-tigervnc.sh'
 #!/usr/bin/env bash
 # Check for MYVNC_VNCPASS variable
 if [ -z ${MYVNC_VNCPASS} ]
@@ -102,16 +75,3 @@ default_border none
 # Execute startup script for webapp
 exec --no-startup-id /usr/bin/bash ~/.config/i3/startapp.sh
 i3config
-10-tigervnc.sh
-
-## TigerVNC launch script
-cat >90-tigervnc.sh <<- '90-tigervnc.sh'
-#!/usr/bin/env bash
-# Launch Tigervnc
-/usr/bin/dbus-launch vncserver :0 &
-90-tigervnc.sh
-
-## Docker build
-DOCKER_BUILDKIT=1 docker build ./. \
-    --tag myvnc/base:i3 \
-    && rm -f Dockerfile *.sh
\ No newline at end of file
diff --git a/i3/90-tigervnc.sh b/i3/90-tigervnc.sh
new file mode 100755
index 0000000..c187a37
--- /dev/null
+++ b/i3/90-tigervnc.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Launch Tigervnc
+/usr/bin/dbus-launch vncserver :0 &
diff --git a/i3/Dockerfile b/i3/Dockerfile
new file mode 100644
index 0000000..c3d8a82
--- /dev/null
+++ b/i3/Dockerfile
@@ -0,0 +1,22 @@
+# syntax = docker/dockerfile:1.2
+FROM myvnc/arch/base
+USER root
+
+# Build ARG: use "root" for debugging
+ARG debug
+
+# X session environment variable
+ENV STARTXBIN=i3
+
+# Install packages
+RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
+    pacman -Syu --ask 4 --needed \
+    tigervnc \
+    i3-wm ttf-dejavu \
+    && pacman -Scc --ask 4
+
+# i3
+COPY *.sh /app/init.d/
+
+# Reset user home directory
+USER ${debug:-user}
diff --git a/i3/build b/i3/build
new file mode 100755
index 0000000..4eec18e
--- /dev/null
+++ b/i3/build
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Docker build
+# Optional: buildtag
+DOCKER_BUILDKIT=1 \
+docker build . \
+    --build-arg debug=${debug:-""} \
+    --tag ${buildtag:-myvnc/arch/base:i3}