Merge pull request #18 from linuxserver/3.17

Author: thespad

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -53,7 +53,6 @@ body:
       options:
         - x86-64
         - arm64
-        - armhf
     validations:
       required: true
   - type: textarea

.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

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-booksonic-air/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-booksonic-air/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
         pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-booksonic-air/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/permissions.yml

@@ -0,0 +1,9 @@
+name: Permission check
+on:
+  pull_request:
+    paths:
+      - '**/run'
+      - '**/finish'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

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
@@ -15,12 +17,11 @@ LANG="C.UTF-8"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add -U --no-cache \
-    curl \
     ffmpeg \
     flac \
     fontconfig \
     lame \
-    openjdk8-jre \
+    openjdk11-jre \
     ttf-dejavu && \
   echo "**** fix XXXsonic status page ****" && \
   find /etc -name "accessibility.properties" -exec rm -fv '{}' + && \
@@ -37,11 +38,13 @@ RUN \
     "https://github.com/popeen/Booksonic-Air/releases/download/${BOOKSONIC_AIR_RELEASE}/booksonic.war" && \
   echo "**** cleanup ****" && \
   rm -rf \
-	/tmp/*
+    /tmp/* \
+    $HOME/.cache
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 4040
+
 VOLUME /config

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
@@ -15,12 +17,11 @@ LANG="C.UTF-8"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add -U --no-cache \
-    curl \
     ffmpeg \
     flac \
     fontconfig \
     lame \
-    openjdk8-jre \
+    openjdk11-jre \
     ttf-dejavu && \
   echo "**** fix XXXsonic status page ****" && \
   find /etc -name "accessibility.properties" -exec rm -fv '{}' + && \
@@ -37,11 +38,13 @@ RUN \
     "https://github.com/popeen/Booksonic-Air/releases/download/${BOOKSONIC_AIR_RELEASE}/booksonic.war" && \
   echo "**** cleanup ****" && \
   rm -rf \
-	/tmp/*
+    /tmp/* \
+    $HOME/.cache
 
 # add local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 4040
+
 VOLUME /config