From 84a85d673b129e9099d5675f512c4cc7c5cb3ee3 Mon Sep 17 00:00:00 2001
From: Myve <forge@myvelabs.com>
Date: Mon, 22 Jul 2024 23:46:28 +0000
Subject: [PATCH] Update compose files to rebuild with every up

---
 build                       | 10 ++++++++++
 firefox/.env                |  9 ++++++---
 firefox/Dockerfile          |  6 ++++--
 firefox/build               | 10 ++++++----
 firefox/docker-compose.yaml | 11 +++++++----
 5 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100755 build

diff --git a/build b/build
new file mode 100755
index 0000000..6bbbeb9
--- /dev/null
+++ b/build
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+workdir=$(pwd)
+
+cd ${workdir}/base
+./build
+
+cd ${workdir}/i3
+./build
+
+cd ${workdir}
diff --git a/firefox/.env b/firefox/.env
index dfea3da..17999cd 100644
--- a/firefox/.env
+++ b/firefox/.env
@@ -1,8 +1,11 @@
 # MyVNC Firefox service
 MYVNC_FIREFOX_PORT=
-MYVNC_FIREFOX_CUSTOM_TITLE=
 MYVNC_FIREFOX_VNCPASS=
+
+MYVNC_FIREFOX_CUSTOM_TITLE=
+MYVNC_FIREFOX_PROXYPATH=
+
 MYVNC_FIREFOX_URL=
 MYVNC_FIREFOX_OPTS=
-MYVNC_FIREFOX_PROXYPATH=
-MYVNC_FIREFOX_VNCSHARING=
\ No newline at end of file
+
+MYVNC_FIREFOX_VNCSHARING=
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
index a25c1c6..807c494 100644
--- a/firefox/Dockerfile
+++ b/firefox/Dockerfile
@@ -6,11 +6,13 @@ USER root
 ARG debug
 
 # Install packages
-RUN apk add --no-cache \
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache \
     firefox
 
 # Tigervnc
 COPY *.sh /app/init.d/
 
 # Reset user
-USER ${debug:-user}
\ No newline at end of file
+USER ${debug:-user}
diff --git a/firefox/build b/firefox/build
index 4855a2e..a2c001e 100755
--- a/firefox/build
+++ b/firefox/build
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 # Docker build
 # Optional buildtag
-DOCKER_BUILDKIT=1 \
-docker build . \
-    --build-arg debug=${debug:-""} \
-    --tag ${buildtag:-myvnc/firefox}
\ No newline at end of file
+# DOCKER_BUILDKIT=1 \
+# docker build . \
+#     --build-arg debug=${debug:-""} \
+#     --tag ${buildtag:-myvnc/firefox}
+
+docker compose up --build --detach
diff --git a/firefox/docker-compose.yaml b/firefox/docker-compose.yaml
index f833bc4..7dbb14b 100644
--- a/firefox/docker-compose.yaml
+++ b/firefox/docker-compose.yaml
@@ -11,15 +11,18 @@ services:
     ports:
       - ${MYVNC_FIREFOX_PORT}:6900
     environment:
-      MYVNC_CUSTOM_TITLE: ${MYVNC_FIREFOX_CUSTOM_TITLE}
       MYVNC_VNCPASS: ${MYVNC_FIREFOX_VNCPASS}
+
+      MYVNC_CUSTOM_TITLE: ${MYVNC_FIREFOX_CUSTOM_TITLE}
+      MYVNC_PROXYPATH: ${MYVNC_FIREFOX_PROXYPATH}
+
       MYVNC_FIREFOX_URL: ${MYVNC_FIREFOX_URL}
       MYVNC_FIREFOX_OPTS: ${MYVNC_FIREFOX_OPTS}
-      MYVNC_PROXYPATH: ${MYVNC_FIREFOX_PROXYPATH}
+
       MYVNC_VNCSHARING: ${MYVNC_FIREFOX_VNCSHARING}
     networks:
       - firefox
 
 networks:
-  novnc:
-    external: false
\ No newline at end of file
+  firefox:
+    external: false