Merge pull request #145 from linuxserver/nightly-3.23

Author: thespad

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.21
+FROM ghcr.io/linuxserver/baseimage-alpine:3.23
 
 # set version label
 ARG BUILD_DATE
@@ -21,6 +21,7 @@ RUN \
     git \
     gobject-introspection-dev \
     jpeg-dev \
+    libedit-dev \
     libpng-dev \
     mpg123-dev \
     openjpeg-dev \
@@ -42,6 +43,7 @@ RUN \
     libffi \
     libpng \
     mpg123 \
+    mp3gain \
     nano \
     openjpeg \
     python3 \
@@ -54,17 +56,6 @@ RUN \
   git clone https://github.com/beetbox/beets.git /tmp/beets && \
   cd /tmp/beets && \
   git checkout -f "${BEETS_VERSION}" && \
-  echo "**** compile mp3gain ****" && \
-  mkdir -p \
-    /tmp/mp3gain-src && \
-  curl -o \
-    /tmp/mp3gain-src/mp3gain.zip -sL \
-    https://sourceforge.net/projects/mp3gain/files/mp3gain/1.6.2/mp3gain-1_6_2-src.zip && \
-  cd /tmp/mp3gain-src && \
-  unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
-  sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
-  make && \
-  make install && \
   echo "**** compile mp3val ****" && \
   mkdir -p \
     /tmp/mp3val-src && \
@@ -79,18 +70,18 @@ RUN \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
-    setuptools \
-    wheel && \
+    setuptools && \
   echo "**** install beets ****" && \
   cd /tmp/beets && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ . && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ . && \
   echo "**** install pip packages ****" && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ \
     beautifulsoup4 \
     beets-extrafiles \
     beetcamp \
     python3-discogs-client \
     flask \
+    flask-cors \
     PyGObject \
     pyacoustid \
     pylast \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
 
 # set version label
 ARG BUILD_DATE
@@ -21,6 +21,7 @@ RUN \
     git \
     gobject-introspection-dev \
     jpeg-dev \
+    libedit-dev \
     libpng-dev \
     mpg123-dev \
     openjpeg-dev \
@@ -42,6 +43,7 @@ RUN \
     libffi \
     libpng \
     mpg123 \
+    mp3gain \
     nano \
     openjpeg \
     python3 \
@@ -54,17 +56,6 @@ RUN \
   git clone https://github.com/beetbox/beets.git /tmp/beets && \
   cd /tmp/beets && \
   git checkout -f "${BEETS_VERSION}" && \
-  echo "**** compile mp3gain ****" && \
-  mkdir -p \
-    /tmp/mp3gain-src && \
-  curl -o \
-    /tmp/mp3gain-src/mp3gain.zip -sL \
-    https://sourceforge.net/projects/mp3gain/files/mp3gain/1.6.2/mp3gain-1_6_2-src.zip && \
-  cd /tmp/mp3gain-src && \
-  unzip -qq /tmp/mp3gain-src/mp3gain.zip && \
-  sed -i "s#/usr/local/bin#/usr/bin#g" /tmp/mp3gain-src/Makefile && \
-  make && \
-  make install && \
   echo "**** compile mp3val ****" && \
   mkdir -p \
     /tmp/mp3val-src && \
@@ -79,18 +70,18 @@ RUN \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
-    setuptools \
-    wheel && \
+    setuptools && \
   echo "**** install beets ****" && \
   cd /tmp/beets && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ . && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ . && \
   echo "**** install pip packages ****" && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ \
     beautifulsoup4 \
     beets-extrafiles \
     beetcamp \
     python3-discogs-client \
     flask \
+    flask-cors \
     PyGObject \
     pyacoustid \
     pylast \

README.md

@@ -296,6 +296,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.02.26:** - Rebase to Alpine 3.23.
 * **27.01.25:** - Rebase to Alpine 3.21, unpin beetcamp.
 * **22.10.24:** - Pin beetcamp to 0.19.2 until upstream requirements fixed.
 * **01.10.24:** - Add packages required for Discogs plugin.

readme-vars.yml

@@ -77,6 +77,7 @@ init_diagram: |
   "beets:nightly" <- Base Images
 # changelog
 changelogs:
+  - {date: "01.02.26:", desc: "Rebase to Alpine 3.23."}
   - {date: "27.01.25:", desc: "Rebase to Alpine 3.21, unpin beetcamp."}
   - {date: "22.10.24:", desc: "Pin beetcamp to 0.19.2 until upstream requirements fixed."}
   - {date: "01.10.24:", desc: "Add packages required for Discogs plugin."}

root/defaults/config.yaml

@@ -41,6 +41,7 @@ fetchart:
 
 replaygain:
     auto: no
+    command: mp3gain
 
 scrub:
     auto: yes