From 710fec6129ddedef61f1ed8ad7ddb2847485407f Mon Sep 17 00:00:00 2001
From: myve <forge@myvelabs.com>
Date: Sun, 26 Jan 2025 12:24:50 +0000
Subject: [PATCH] Returned i3 due to smaller image size

---
 firefox/20-firefox.sh | 5 +++--
 firefox/Dockerfile    | 3 ++-
 i3/10-tigervnc.sh     | 2 +-
 i3/Dockerfile         | 3 ++-
 openbox/Dockerfile    | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/firefox/20-firefox.sh b/firefox/20-firefox.sh
index 7cf719f..75ed79c 100755
--- a/firefox/20-firefox.sh
+++ b/firefox/20-firefox.sh
@@ -45,8 +45,9 @@ user_pref("browser.tabs.closeWindowWithLastTab", false);
 user_pref("browser.fullscreen.autohide", false);
 firefox
 
-# Openbox autostart
-cat >~/.config/openbox/autostart <<- 'firefox'
+# Firefox startup
+install /dev/stdin ~/.config/${AUTOSTARTDIR}/autostart <<- 'firefox'
+#!/usr/bin/env bash
 # Run firefox
 while true
 do
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
index 979d850..071ed1c 100644
--- a/firefox/Dockerfile
+++ b/firefox/Dockerfile
@@ -1,5 +1,6 @@
 # syntax = docker/dockerfile:1
-FROM myvnc/alpine/openbox
+#FROM myvnc/alpine/openbox
+FROM myvnc/alpine/i3
 USER root
 
 # Build ARG: use "root" for debugging
diff --git a/i3/10-tigervnc.sh b/i3/10-tigervnc.sh
index 03c02ac..f7890cb 100755
--- a/i3/10-tigervnc.sh
+++ b/i3/10-tigervnc.sh
@@ -73,5 +73,5 @@ for_window [all] border none
 default_border none
 
 # Execute startup script for webapp
-exec --no-startup-id /bin/bash ~/.config/i3/startapp.sh
+exec --no-startup-id /bin/bash ~/.config/i3/autostart
 i3config
diff --git a/i3/Dockerfile b/i3/Dockerfile
index 9765e44..46c3048 100644
--- a/i3/Dockerfile
+++ b/i3/Dockerfile
@@ -7,6 +7,7 @@ ARG debug
 
 # X session environment variable
 ENV STARTXBIN=i3
+ENV AUTOSTARTDIR=i3
 
 # Run
 RUN apk add --no-cache \
@@ -18,4 +19,4 @@ RUN apk add --no-cache \
 COPY *.sh /app/init.d/
 
 # Reset user
-USER ${debug:-user}
\ No newline at end of file
+USER ${debug:-user}
diff --git a/openbox/Dockerfile b/openbox/Dockerfile
index 9a15d80..adad976 100644
--- a/openbox/Dockerfile
+++ b/openbox/Dockerfile
@@ -7,6 +7,7 @@ ARG debug
 
 # X session environment variable
 ENV STARTXBIN=openbox-session
+ENV AUTOSTARTDIR=openbox
 
 # Run
 RUN apk add --no-cache \