Rebase to Alpine 3.17, bump jre to 11, deprecate armhf

Author: thespad

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

Dockerfile.armhf

@@ -6,6 +6,7 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
+build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'popeen'

jenkins-vars.yml

@@ -16,12 +16,9 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
-development_versions: true
-development_versions_items:
-  - { tag: "latest", desc: "Stable booksonic-air releases" }
+development_versions: false
 
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
@@ -32,10 +29,10 @@ param_env_vars:
   - { env_var: "CONTEXT_PATH", env_value: "url-base", desc: "Base url for use with reverse proxies etc." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
-  - { vol_path: "/audiobooks", vol_host_path: "</path/to/audiobooks>", desc: "Audiobooks." }
-  - { vol_path: "/podcasts", vol_host_path: "</path/to/podcasts>", desc: "Podcasts." }
-  - { vol_path: "/othermedia", vol_host_path: "</path/to/othermedia>", desc: "Other media." }
+  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." }
+  - { vol_path: "/audiobooks", vol_host_path: "/path/to/audiobooks", desc: "Audiobooks." }
+  - { vol_path: "/podcasts", vol_host_path: "/path/to/podcasts", desc: "Podcasts." }
+  - { vol_path: "/othermedia", vol_host_path: "/path/to/othermedia", desc: "Other media." }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "4040", internal_port: "4040", port_desc: "Application WebUI" }
@@ -46,5 +43,6 @@ app_setup_block: "Whilst this is a more up to date rebase of the original Bookso
 
 # changelog
 changelogs:
+  - { date: "25.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, bump jre to 11, deprecate armhf." }
   - { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
   - { date: "15.09.20:", desc: "Initial Release." }

readme-vars.yml

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+mkdir -p "${BOOKSONIC_AIR_SETTINGS}"/transcode
+
+if [[ ! -e "${BOOKSONIC_AIR_SETTINGS}"/transcode/ffmpeg ]] || [[ ! -e  "${BOOKSONIC_AIR_SETTINGS}"/transcode/flac ]] || [[ ! -e "${BOOKSONIC_AIR_SETTINGS}"/transcode/lame ]]; then
+    ln -sf /usr/bin/ffmpeg "${BOOKSONIC_AIR_SETTINGS}"/transcode/
+    ln -sf /usr/bin/flac "${BOOKSONIC_AIR_SETTINGS}"/transcode/
+    ln -sf /usr/bin/lame "${BOOKSONIC_AIR_SETTINGS}"/transcode/
+fi
+
+lsiown -R abc:abc \
+    /config \
+    "${BOOKSONIC_AIR_HOME}"

root/etc/cont-init.d/30-config

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

root/etc/s6-overlay/s6-rc.d/init-booksonic-air-config/dependencies.d/init-config

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