Rebase to alpine 3.17, upgrade to openjdk17

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -8,10 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    curl \
-    jq && \
   echo "**** install runtime packages ****" && \
   if [ -z ${DOPLARR_RELEASE+x} ]; then \
     DOPLARR_RELEASE=$(curl -sX GET "https://api.github.com/repos/kiranshila/doplarr/releases/latest" \
@@ -25,10 +23,8 @@ RUN \
   cp /tmp/doplarr.jar -d /app/doplarr/bin && \
   chmod +x /app/doplarr/bin/doplarr.jar && \
   apk add --no-cache \
-    openjdk16-jre-headless && \
+    openjdk17-jre-headless && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -8,10 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    curl \
-    jq && \
   echo "**** install runtime packages ****" && \
   if [ -z ${DOPLARR_RELEASE+x} ]; then \
     DOPLARR_RELEASE=$(curl -sX GET "https://api.github.com/repos/kiranshila/doplarr/releases/latest" \
@@ -25,10 +23,8 @@ RUN \
   cp /tmp/doplarr.jar -d /app/doplarr/bin && \
   chmod +x /app/doplarr/bin/doplarr.jar && \
   apk add --no-cache \
-    openjdk16-jre-headless && \
+    openjdk17-jre-headless && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /root/.cache \
     /tmp/*

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -8,6 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # copy local files
-COPY root/ /
+COPY root-armhf/ /
 
 # This Doplarr image does not support 32 bit ARM due to lack of available OS packages

Jenkinsfile

@@ -28,7 +28,7 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/doplarr'
     PR_DOCKERHUB_IMAGE = 'lspipepr/doplarr'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.15'
+    DIST_TAG = '3.17'
     MULTIARCH='true'
     CI='true'
     CI_WEB='false'

README.md

@@ -280,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.12.22:** - Rebase to alpine 3.17, upgrade to openjdk17.
 * **01.05.22:** - Remove `DISCORD__ROLE_ID` environment variable, see [Permissions Configuration](https://github.com/kiranshila/Doplarr/blob/main/docs/configuration.md#permissions).
 * **30.01.22:** - Variable adjustments.
 * **30.01.22:** - Initial Release.

jenkins-vars.yml

@@ -18,7 +18,7 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/doplarr'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/doplarr'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.15'
+  - DIST_TAG = '3.17'
   - MULTIARCH='true'
   - CI='true'
   - CI_WEB='false'

readme-vars.yml

@@ -77,6 +77,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.12.22:", desc: "Rebase to alpine 3.17, upgrade to openjdk17." }
   - { date: "01.05.22:", desc: "Remove `DISCORD__ROLE_ID` environment variable, see [Permissions Configuration](https://github.com/kiranshila/Doplarr/blob/main/docs/configuration.md#permissions)." }
   - { date: "30.01.22:", desc: "Variable adjustments." }
   - { date: "30.01.22:", desc: "Initial Release." }

root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/run

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
-if [[ "$(uname -m)" == "armv7l" ]]; then
 cat <<-EOF
     ********************************************************
     ********************************************************
@@ -13,4 +13,3 @@ cat <<-EOF
     ********************************************************
     ********************************************************
 EOF
-fi

root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/type

@@ -0,0 +1 @@
+oneshot

root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-doplarr-config/run

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

@@ -1,9 +1,10 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make our folders
 mkdir -p \
-	/config
+    /config
 
 # permissions
-chown -R abc:abc \
-	/config
+lsiown -R abc:abc \
+    /config

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

@@ -0,0 +1 @@
+oneshot

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

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-doplarr-config/run

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

@@ -1,11 +1,8 @@
 #!/usr/bin/with-contenv bash
-
-if [[ "$(uname -m)" == "armv7l" ]]; then
-    sleep infinity
-fi
+# shellcheck shell=bash
 
 if [[ ${DISCORD__TOKEN+x} == "" ]]; then
-cat <<-EOF
+    cat <<-EOF
     ********************************************************
     ********************************************************
     *                                                      *
@@ -20,7 +17,7 @@ EOF
 fi
 
 # add option to pass runtime arguments
-IFS=" " read -r -a RUN_ARRAY <<< "${JAVA_OPTS}"
+IFS=" " read -r -a RUN_ARRAY <<<"${JAVA_OPTS}"
 
 cd /app/doplarr/bin || exit
 

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

@@ -0,0 +1 @@
+longrun