From e63e8f20688544992a5cf92a04ddfcce3a312cce Mon Sep 17 00:00:00 2001
From: DenTechs <48604154+DenTechs@users.noreply.github.com>
Date: Fri, 31 Oct 2025 11:39:40 -0400
Subject: [PATCH 1/3] github actions for auto building and uploading

---
 .github/workflows/docker-build-push.yml | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .github/workflows/docker-build-push.yml

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
new file mode 100644
index 0000000..4a2d974
--- /dev/null
+++ b/.github/workflows/docker-build-push.yml
@@ -0,0 +1,67 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - master
+      - main
+      - ubuntunoble
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - master
+      - main
+  workflow_dispatch:
+
+env:
+  REGISTRY: docker.io
+  IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/docker-baseimage-selkies
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=ubuntunoble
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo ${{ steps.build.outputs.digest }}

From 3b253fac2143a18e598577b2a2dcf4592c798d3b Mon Sep 17 00:00:00 2001
From: DenTechs <48604154+DenTechs@users.noreply.github.com>
Date: Fri, 31 Oct 2025 12:16:57 -0400
Subject: [PATCH 2/3] Initial fix attempt for default res

---
 root/etc/s6-overlay/s6-rc.d/svc-de/run | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-de/run b/root/etc/s6-overlay/s6-rc.d/svc-de/run
index bf6a826..699b3e2 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-de/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-de/run
@@ -9,10 +9,20 @@ while true; do
 done
 
 # set sane resolution before starting apps
-if ! s6-setuidgid abc xrandr | grep -q "1024x768"; then
-  s6-setuidgid abc xrandr --newmode "1024x768" 63.50  1024 1072 1176 1328  768 771 775 798 -hsync +vsync
-  s6-setuidgid abc xrandr --addmode screen "1024x768"
-  s6-setuidgid abc xrandr --output screen --mode "1024x768" --dpi 96
+# Use environment variables if set, otherwise default to 1024x768
+RESOLUTION_WIDTH=${SELKIES_MANUAL_WIDTH:-1024}
+RESOLUTION_HEIGHT=${SELKIES_MANUAL_HEIGHT:-768}
+RESOLUTION="${RESOLUTION_WIDTH}x${RESOLUTION_HEIGHT}"
+
+# Generate modeline using cvt
+MODELINE=$(s6-setuidgid abc cvt ${RESOLUTION_WIDTH} ${RESOLUTION_HEIGHT} | grep "Modeline" | sed 's/^.*Modeline //')
+MODELINE_NAME=$(echo "$MODELINE" | cut -d' ' -f1 | tr -d '"')
+MODELINE_PARAMS=$(echo "$MODELINE" | cut -d' ' -f2-)
+
+if ! s6-setuidgid abc xrandr | grep -q "$RESOLUTION"; then
+  s6-setuidgid abc xrandr --newmode $MODELINE
+  s6-setuidgid abc xrandr --addmode screen "$MODELINE_NAME"
+  s6-setuidgid abc xrandr --output screen --mode "$MODELINE_NAME" --dpi 96
 fi
 
 # set xresources

From 61dcef89f07c1b0728f96d0fccdce980ccda7090 Mon Sep 17 00:00:00 2001
From: DenTechs <48604154+DenTechs@users.noreply.github.com>
Date: Fri, 31 Oct 2025 12:48:52 -0400
Subject: [PATCH 3/3] Removed github action, updated comment

---
 .github/workflows/docker-build-push.yml | 67 -------------------------
 root/etc/s6-overlay/s6-rc.d/svc-de/run  |  2 +-
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 .github/workflows/docker-build-push.yml

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
deleted file mode 100644
index 4a2d974..0000000
--- a/.github/workflows/docker-build-push.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    branches:
-      - master
-      - main
-      - ubuntunoble
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - master
-      - main
-  workflow_dispatch:
-
-env:
-  REGISTRY: docker.io
-  IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/docker-baseimage-selkies
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=raw,value=ubuntunoble
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Image digest
-        run: echo ${{ steps.build.outputs.digest }}
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-de/run b/root/etc/s6-overlay/s6-rc.d/svc-de/run
index 699b3e2..dcdf0ae 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-de/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-de/run
@@ -8,7 +8,7 @@ while true; do
   sleep .5
 done
 
-# set sane resolution before starting apps
+# set resolution before starting apps
 # Use environment variables if set, otherwise default to 1024x768
 RESOLUTION_WIDTH=${SELKIES_MANUAL_WIDTH:-1024}
 RESOLUTION_HEIGHT=${SELKIES_MANUAL_HEIGHT:-768}