From ad03c8985a61637f4cbe508ab1c7ba9fad41f170 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sun, 2 Oct 2022 20:43:29 -0400
Subject: [PATCH] rebase to 3.16 and s6v3, update to dotnet 6

---
 Dockerfile                                                    | 4 ++--
 Dockerfile.aarch64                                            | 4 ++--
 Dockerfile.armhf                                              | 4 ++--
 readme-vars.yml                                               | 1 +
 .../init-config-end/dependencies.d/init-webgrabplus-config    | 0
 .../init-webgrabplus-config/dependencies.d/init-config        | 0
 .../s6-rc.d/init-webgrabplus-config/run}                      | 0
 root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type      | 1 +
 root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up        | 1 +
 .../s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services  | 0
 root/etc/{services.d/cron => s6-overlay/s6-rc.d/svc-cron}/run | 0
 root/etc/s6-overlay/s6-rc.d/svc-cron/type                     | 1 +
 .../s6-rc.d/user/contents.d/init-webgrabplus-config           | 0
 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron          | 0
 14 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-config
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/dependencies.d/init-config
 rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-webgrabplus-config/run} (100%)
 mode change 100644 => 100755
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services
 rename root/etc/{services.d/cron => s6-overlay/s6-rc.d/svc-cron}/run (100%)
 mode change 100644 => 100755
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-cron/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webgrabplus-config
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron

diff --git a/Dockerfile b/Dockerfile
index 18ffce2..edd41fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -25,7 +25,7 @@ RUN \
   curl -o /tmp/dotnet-install.sh -L \
     https://dot.net/v1/dotnet-install.sh && \
   chmod +x /tmp/dotnet-install.sh && \
-  /tmp/dotnet-install.sh -c 5.0 --install-dir /app/dotnet --runtime dotnet && \
+  /tmp/dotnet-install.sh -c 6.0 --install-dir /app/dotnet --runtime dotnet && \
   echo "**** install webgrabplus ****" && \
   if [ -z "$WEBGRAB_VER" ]; then \
     WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index bf07ece..d6a9015 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -26,7 +26,7 @@ RUN \
   curl -o /tmp/dotnet-install.sh -L \
     https://dot.net/v1/dotnet-install.sh && \
   chmod +x /tmp/dotnet-install.sh && \
-  /tmp/dotnet-install.sh -c 5.0 --install-dir /app/dotnet --runtime dotnet && \
+  /tmp/dotnet-install.sh -c 6.0 --install-dir /app/dotnet --runtime dotnet && \
   echo "**** install webgrabplus ****" && \
   if [ -z "$WEBGRAB_VER" ]; then \
     WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6e1bf46..3163049 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -26,7 +26,7 @@ RUN \
   curl -o /tmp/dotnet-install.sh -L \
     https://dot.net/v1/dotnet-install.sh && \
   chmod +x /tmp/dotnet-install.sh && \
-  /tmp/dotnet-install.sh -c 5.0 --install-dir /app/dotnet --runtime dotnet && \
+  /tmp/dotnet-install.sh -c 6.0 --install-dir /app/dotnet --runtime dotnet && \
   echo "**** install webgrabplus ****" && \
   if [ -z "$WEBGRAB_VER" ]; then \
     WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
diff --git a/readme-vars.yml b/readme-vars.yml
index e730747..da68b08 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -70,6 +70,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.03.22:", desc: "Rebase to Alpine 3.16 and s6v3. Update to dotnet 6." } 
   - { date: "29.04.22:", desc: "Add `hostname` and `mac_address` arguments that are needed for the license check to compose and cli samples." } 
   - { date: "23.03.22:", desc: "Rebase to Alpine 3.15." } 
   - { date: "23.03.22:", desc: "Update to use dotnet instead of mono." } 
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-webgrabplus-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/dependencies.d/init-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run
old mode 100644
new mode 100755
similarity index 100%
rename from root/etc/cont-init.d/30-config
rename to root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up
new file mode 100644
index 0000000..df0c4e4
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-cron/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run
old mode 100644
new mode 100755
similarity index 100%
rename from root/etc/services.d/cron/run
rename to root/etc/s6-overlay/s6-rc.d/svc-cron/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/type b/root/etc/s6-overlay/s6-rc.d/svc-cron/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-cron/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webgrabplus-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-webgrabplus-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-cron
new file mode 100644
index 0000000..e69de29