Merge pull request #104 from linuxserver/3.18-nightly

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -11,7 +11,7 @@ LABEL maintainer="aptalca"
 
 RUN \
   echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies --upgrade \
+  apk add --no-cache --virtual=build-dependencies \
     build-base \
     cairo-dev \
     cargo \
@@ -26,7 +26,7 @@ RUN \
     openjpeg-dev \
     python3-dev && \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
     chromaprint \
     expat \
     ffmpeg \
@@ -36,6 +36,7 @@ RUN \
     gobject-introspection \
     gst-plugins-good \
     gstreamer \
+    imagemagick \
     jpeg \
     lame \
     libffi \
@@ -78,9 +79,9 @@ RUN \
   tar xzf /tmp/mp3val-src/mp3val.tar.gz --strip 1 && \
   make -f Makefile.linux && \
   cp -p mp3val /usr/bin && \
-  echo "**** install pip ****" && \
+  echo "**** install pip packages ****" && \
-  python3 -m ensurepip && \
+  python3 -m venv /lsiopy && \
-  pip3 install -U --no-cache-dir \
+  pip install -U --no-cache-dir \
     pip \
     setuptools \
     wheel && \
@@ -89,14 +90,13 @@ RUN \
   python3 setup.py build && \
   python3 setup.py install --prefix=/usr --root=/ && \
   echo "**** install pip packages ****" && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
     beautifulsoup4 \
     beets-extrafiles \
     beetcamp \
     discogs-client \
     flask \
     PyGObject \
-    pillow \
     pyacoustid \
     pylast \
     requests \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -11,7 +11,7 @@ LABEL maintainer="aptalca"
 
 RUN \
   echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies --upgrade \
+  apk add --no-cache --virtual=build-dependencies \
     build-base \
     cairo-dev \
     cargo \
@@ -26,7 +26,7 @@ RUN \
     openjpeg-dev \
     python3-dev && \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
     chromaprint \
     expat \
     ffmpeg \
@@ -36,6 +36,7 @@ RUN \
     gobject-introspection \
     gst-plugins-good \
     gstreamer \
+    imagemagick \
     jpeg \
     lame \
     libffi \
@@ -78,9 +79,9 @@ RUN \
   tar xzf /tmp/mp3val-src/mp3val.tar.gz --strip 1 && \
   make -f Makefile.linux && \
   cp -p mp3val /usr/bin && \
-  echo "**** install pip ****" && \
+  echo "**** install pip packages ****" && \
-  python3 -m ensurepip && \
+  python3 -m venv /lsiopy && \
-  pip3 install -U --no-cache-dir \
+  pip install -U --no-cache-dir \
     pip \
     setuptools \
     wheel && \
@@ -89,14 +90,13 @@ RUN \
   python3 setup.py build && \
   python3 setup.py install --prefix=/usr --root=/ && \
   echo "**** install pip packages ****" && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
     beautifulsoup4 \
     beets-extrafiles \
     beetcamp \
     discogs-client \
     flask \
     PyGObject \
-    pillow \
     pyacoustid \
     pylast \
     requests \

README.md

@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.08.23:** - Rebase to Alpine 3.18, switch from Pillow to Imagemagick.
 * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **25.03.23:** - Add requests_oauthlib required for [beatport plugin](https://beets.readthedocs.io/en/stable/plugins/beatport.html).
 * **24.12.22:** - Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin.

jenkins-vars.yml

@@ -6,6 +6,7 @@ external_type: github_commit
 release_type: prerelease
 release_tag: nightly
 ls_branch: nightly
+build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'BEETS_VERSION'
   - EXT_GIT_BRANCH = 'master'

readme-vars.yml

@@ -28,6 +28,7 @@ param_ports:
   - {external_port: "8337", internal_port: "8337", port_desc: "Application WebUI"}
 # changelog
 changelogs:
+  - {date: "25.08.23:", desc: "Rebase to Alpine 3.18, switch from Pillow to Imagemagick."}
   - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "25.03.23:", desc: "Add requests_oauthlib required for [beatport plugin](https://beets.readthedocs.io/en/stable/plugins/beatport.html)."}
   - {date: "24.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin."}