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

---
 Dockerfile                                                    | 4 +++-
 Dockerfile.aarch64                                            | 4 +++-
 Dockerfile.armhf                                              | 4 +++-
 readme-vars.yml                                               | 1 +
 .../s6-rc.d/init-config-end/dependencies.d/init-openboxcopy   | 0
 .../init-openboxcopy/dependencies.d/init-rdesktop-web-end     | 0
 .../s6-rc.d/init-openboxcopy/run}                             | 0
 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type             | 1 +
 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up               | 1 +
 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy  | 0
 10 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
 rename root/etc/{cont-init.d/56-openboxcopy => s6-overlay/s6-rc.d/init-openboxcopy/run} (100%)
 mode change 100644 => 100755
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy

diff --git a/Dockerfile b/Dockerfile
index e4597c4..a8f499d 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
@@ -10,6 +10,8 @@ LABEL maintainer="thelamer"
 # app title
 ENV TITLE=Kdenlive
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index db5ec9d..3cc787e 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
@@ -10,6 +10,8 @@ LABEL maintainer="thelamer"
 # app title
 ENV TITLE=Kdenlive
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 226cd39..d80fce6 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
@@ -10,6 +10,8 @@ LABEL maintainer="thelamer"
 # app title
 ENV TITLE=Kdenlive
 
+ARG DEBIAN_FRONTEND="noninteractive"
+
 RUN \
   echo "**** install packages ****" && \
   apt-get update && \
diff --git a/readme-vars.yml b/readme-vars.yml
index c0484db..57a4a73 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -97,5 +97,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.09.22:", desc: "Migrate to s6v3." }
   - { date: "09.03.22:", desc: "Update seccomp explanation." }
   - { date: "07.03.22:", desc: "Initial release." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run
old mode 100644
new mode 100755
similarity index 100%
rename from root/etc/cont-init.d/56-openboxcopy
rename to root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up
new file mode 100644
index 0000000..c5a506f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-openboxcopy/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy
new file mode 100644
index 0000000..e69de29

From 90cb211bf1721d2f30a7388dff4280fa1fcef899 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 16 Sep 2022 19:24:05 +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 5735391..b9ab04d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -710,7 +710,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 251fe81..e54f7ff 100644
--- a/README.md
+++ b/README.md
@@ -286,5 +286,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.09.22:** - Migrate to s6v3.
 * **09.03.22:** - Update seccomp explanation.
 * **07.03.22:** - Initial release.