From 0d0f3154f70640580869be66726682d6182a98ed Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Thu, 15 Sep 2022 16:07:43 +0100
Subject: [PATCH 1/2] Migrate to s6v3

---
 Dockerfile         | 4 +++-
 Dockerfile.aarch64 | 4 +++-
 Dockerfile.armhf   | 4 +++-
 readme-vars.yml    | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3bb0126e..fb6dd072 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy-f5e8ed1d-ls35
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -6,6 +6,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # prevent Ubuntu's firefox stub from being installed
 COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index fe5f7cea..8c98bffe 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy-f5e8ed1d-ls35
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -6,6 +6,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # prevent Ubuntu's firefox stub from being installed
 COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index a42f0b40..7f16dc00 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy-f5e8ed1d-ls35
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -6,6 +6,8 @@ ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 # prevent Ubuntu's firefox stub from being installed
 COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
 
diff --git a/readme-vars.yml b/readme-vars.yml
index b0f13bf5..3474d919 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -75,4 +75,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.09.22:", desc: "Migrate to s6v3." }
   - { date: "20.04.21:", desc: "Initial release." }

From 4b3281fa48da09780350b609e65f78debeead075 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 16 Sep 2022 19:25:40 +0100
Subject: [PATCH 2/2] Regen jenkinsfile

---
 Jenkinsfile | 2 +-
 README.md   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0c99d36b..2e91062e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -708,7 +708,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }
diff --git a/README.md b/README.md
index 6c0578d1..bb5a2c0e 100644
--- a/README.md
+++ b/README.md
@@ -267,4 +267,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.09.22:** - Migrate to s6v3.
 * **20.04.21:** - Initial release.