From 2f03f48e968178ea888ed10328fdc65d0e611fef Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 18 Dec 2022 12:43:32 -0600 Subject: [PATCH] Rebase to alpine 3.17, upgrade to openjdk17 --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ Dockerfile | 12 ++++-------- Dockerfile.aarch64 | 12 ++++-------- Dockerfile.armhf | 6 ++++-- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + .../dependencies.d/init-doplarr-armless | 0 .../init-doplarr-armless/dependencies.d/init-config | 0 .../etc/s6-overlay/s6-rc.d/init-doplarr-armless/run | 3 +-- .../etc/s6-overlay/s6-rc.d/init-doplarr-armless/type | 1 + .../etc/s6-overlay/s6-rc.d/init-doplarr-armless/up | 1 + .../s6-rc.d/user/contents.d/init-doplarr-armless | 0 .../dependencies.d/init-doplarr-config | 0 .../init-doplarr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-doplarr-config/run} | 7 ++++--- root/etc/s6-overlay/s6-rc.d/init-doplarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-doplarr-config/up | 1 + .../s6-rc.d/svc-doplarr/dependencies.d/init-services | 0 .../doplarr => s6-overlay/s6-rc.d/svc-doplarr}/run | 9 +++------ root/etc/s6-overlay/s6-rc.d/svc-doplarr/type | 1 + .../s6-rc.d/user/contents.d/init-doplarr-config | 0 .../s6-overlay/s6-rc.d/user/contents.d/svc-doplarr | 0 24 files changed, 41 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-armless create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/dependencies.d/init-config rename root/etc/cont-init.d/19-armless => root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/run (93%) mode change 100644 => 100755 create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/type create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/up create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-armless create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-doplarr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-doplarr-config/run} (52%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-doplarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-doplarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-doplarr/dependencies.d/init-services rename root/etc/{services.d/doplarr => s6-overlay/s6-rc.d/svc-doplarr}/run (86%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-doplarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-doplarr diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 9f57b09..fecdd67 100644 --- a/Dockerfile +++ b/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/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0b8212c..7ad5b02 100644 --- a/Dockerfile.aarch64 +++ b/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/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d62991d..18dbf8a 100644 --- a/Dockerfile.armhf +++ b/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 diff --git a/Jenkinsfile b/Jenkinsfile index 72819a4..8d4780e 100644 --- a/Jenkinsfile +++ b/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' diff --git a/README.md b/README.md index 7db69cc..75ef3e4 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 390482f..886c2ed 100644 --- a/jenkins-vars.yml +++ b/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' diff --git a/readme-vars.yml b/readme-vars.yml index b9ee35a..3550e89 100644 --- a/readme-vars.yml +++ b/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." } diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-armless b/root-armhf/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-armless new file mode 100644 index 0000000..e69de29 diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/dependencies.d/init-config b/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/19-armless b/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/run old mode 100644 new mode 100755 similarity index 93% rename from root/etc/cont-init.d/19-armless rename to root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/run index 4a6b3ba..fbd1458 --- a/root/etc/cont-init.d/19-armless +++ b/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 diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/type b/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/type @@ -0,0 +1 @@ +oneshot diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/up b/root-armhf/etc/s6-overlay/s6-rc.d/init-doplarr-armless/up new file mode 100644 index 0000000..90a4389 --- /dev/null +++ b/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 diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-armless b/root-armhf/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-armless new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-doplarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-doplarr-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-doplarr-config/run old mode 100644 new mode 100755 similarity index 52% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-doplarr-config/run index b598ca8..d7be1d9 --- a/root/etc/cont-init.d/30-config +++ b/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 diff --git a/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/up new file mode 100644 index 0000000..90a4389 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-doplarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-doplarr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-doplarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/doplarr/run b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/run old mode 100644 new mode 100755 similarity index 86% rename from root/etc/services.d/doplarr/run rename to root/etc/s6-overlay/s6-rc.d/svc-doplarr/run index 5f1c776..fc7fe86 --- a/root/etc/services.d/doplarr/run +++ b/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 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-doplarr/type b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-doplarr/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-doplarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-doplarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-doplarr new file mode 100644 index 0000000..e69de29