Rebase to 3.17

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -15,8 +17,6 @@ ENV HOME /config
 RUN \
   echo "**** install packages ****" && \
   apk -U --update --no-cache add \
-    bash \
-    curl \
     icu-libs \
     iputils \
     unzip && \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -16,8 +18,6 @@ ENV HOME /config
 RUN \
   echo "**** install packages ****" && \
   apk -U --update --no-cache add \
-    bash \
-    curl \
     icu-libs \
     iputils \    
     unzip && \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -16,8 +18,6 @@ ENV HOME /config
 RUN \
   echo "**** install packages ****" && \
   apk -U --update --no-cache add \
-    bash \
-    curl \
     icu-libs \
     iputils \    
     unzip && \

README.md

@@ -78,7 +78,7 @@ Do not adjust the command!
 
 Below is the syntax of the cron file.
 
-```
+```text
  ┌───────────── minute (0 - 59)
  │ ┌───────────── hour (0 - 23)
  │ │ ┌───────────── day of month (1 - 31)
@@ -255,6 +255,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **13.03.23:** - Rebase to Alpine 3.17.
 * **23.03.22:** - Rebase to Alpine 3.16 and s6v3. Update to dotnet 6.
 * **29.04.22:** - Add `hostname` and `mac_address` arguments that are needed for the license check to compose and cli samples.
 * **23.03.22:** - Rebase to Alpine 3.15.

readme-vars.yml

@@ -56,7 +56,7 @@ app_setup_block: |
 
   Below is the syntax of the cron file.
 
-  ```
+  ```text
    ┌───────────── minute (0 - 59)
    │ ┌───────────── hour (0 - 23)
    │ │ ┌───────────── day of month (1 - 31)
@@ -70,22 +70,23 @@ 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." } 
-  - { date: "06.01.22:", desc: "Rebase to Ubuntu focal. Enable auto builds on version updates (beta and stable)." } 
-  - { date: "17.12.21:", desc: "Update to version 3.2.2 beta." } 
-  - { date: "05.08.21:", desc: "Update to version 3.2.1 beta." } 
-  - { date: "05.06.21:", desc: "Added mono-devel dependency." } 
-  - { date: "04.06.21:", desc: "Update to version 3.1.8 beta." } 
-  - { date: "22.03.21:", desc: "Update to version 3.1.7 beta." } 
-  - { date: "07.03.21:", desc: "Update to version 3.1.6 beta." } 
-  - { date: "29.01.21:", desc: "Update external version number to show as 3.1.5." } 
-  - { date: "24.01.21:", desc: "Update to version 3.1.5 beta." } 
-  - { date: "22.12.20:", desc: "Update to version 3.1.4 beta." } 
-  - { date: "12.10.20:", desc: "Fix version number in jenkinsfile." } 
-  - { date: "12.10.20:", desc: "Update to version 3.1.1 beta." } 
+  - { date: "13.03.23:", desc: "Rebase to Alpine 3.17." }
+  - { 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." }
+  - { date: "06.01.22:", desc: "Rebase to Ubuntu focal. Enable auto builds on version updates (beta and stable)." }
+  - { date: "17.12.21:", desc: "Update to version 3.2.2 beta." }
+  - { date: "05.08.21:", desc: "Update to version 3.2.1 beta." }
+  - { date: "05.06.21:", desc: "Added mono-devel dependency." }
+  - { date: "04.06.21:", desc: "Update to version 3.1.8 beta." }
+  - { date: "22.03.21:", desc: "Update to version 3.1.7 beta." }
+  - { date: "07.03.21:", desc: "Update to version 3.1.6 beta." }
+  - { date: "29.01.21:", desc: "Update external version number to show as 3.1.5." }
+  - { date: "24.01.21:", desc: "Update to version 3.1.5 beta." }
+  - { date: "22.12.20:", desc: "Update to version 3.1.4 beta." }
+  - { date: "12.10.20:", desc: "Fix version number in jenkinsfile." }
+  - { date: "12.10.20:", desc: "Update to version 3.1.1 beta." }
   - { date: "22.06.20:", desc: "Add mono webrequest library." }
   - { date: "18.06.20:", desc: "Update to v3.1.0." }
   - { date: "29.03.20:", desc: "Update to v3.0.0. Changed to use wg3-cron file." }

root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run

@@ -1,17 +1,23 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # copy config
-[[ ! -e /config/WebGrab++.config.xml ]] && \
+if [[ ! -e /config/WebGrab++.config.xml ]]; then
     cp /defaults/WebGrab++.config.xml /config/
-[[ ! -e /config/siteini.pack ]] && \
+fi
+
+if [[ ! -e /config/siteini.pack ]]; then
     cp -R /defaults/ini/siteini.pack /config/
+fi
 
 # warn user about changing name for crontab file
 echo "******** Please use the file wg3-cron to adjust the scheduled time for running WebGrab++. wg-cron can now be deleted. ********"
 
 # add cron file for running webgrab+plus
-[[ ! -e /config/wg3-cron ]] && \
+if [[ ! -e /config/wg3-cron ]]; then
     cp /defaults/wg3-cron /config/wg3-cron
+fi
+
 crontab -u abc /config/wg3-cron
 
 mkdir -p /app/wg++/bin.net/WebGrab+Plus
@@ -19,7 +25,7 @@ mkdir -p /config/License
 ln -sf /config/License /app/wg++/bin.net/WebGrab+Plus
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /app \
     /config \
     /data

root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/type

@@ -1 +1 @@
-oneshot
+oneshot

root/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/up

@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run
+/etc/s6-overlay/s6-rc.d/init-webgrabplus-config/run

root/etc/s6-overlay/s6-rc.d/svc-cron/run

@@ -1,3 +1,4 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 exec /usr/sbin/crond -f -L 1

root/etc/s6-overlay/s6-rc.d/svc-cron/type

@@ -1 +1 @@
-longrun
+longrun