Backup_Repos/docker-beets
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-beets synced 2025-12-06 08:23:31 +01:00
Code Issues Projects Releases Wiki Activity

Rebasing master to alpine 3.17

Browse source
This commit is contained in:
Eric Nemchik 2022-12-24 17:17:33 -06:00
parent e1fe023f99
commit b76ceacec0
17 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Dockerfile
View file

@ -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
@ -10,21 +12,19 @@ LABEL maintainer="aptalca"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies --upgrade \
build-base \
cargo \
cmake \
ffmpeg-dev \
fftw-dev \
g++ \
gcc \
git \
jpeg-dev \
libpng-dev \
make \
mpg123-dev \
openjpeg-dev \
python3-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
curl \
expat \
ffmpeg \
ffmpeg-libs \
@ -34,7 +34,6 @@ RUN \
gst-plugins-good \
gstreamer \
jpeg \
jq \
lame \
libffi \
libpng \
@ -42,12 +41,9 @@ RUN \
nano \
openjpeg \
py3-gobject3 \
py3-pip \
py3-pylast \
python3 \
sqlite-libs \
tar \
wget && \
sqlite-libs && \
echo "**** compile mp3gain ****" && \
mkdir -p \
/tmp/mp3gain-src && \
@ -81,12 +77,13 @@ RUN \
make install && \
echo "**** install pip packages ****" && \
if [ -z ${BEETS_VERSION+x} ]; then \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json |jq -r '. | .info.version'); \
fi && \
python3 -m pip install --upgrade pip && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ \
wheel \
python3 -m ensurepip && \
pip3 install -U --no-cache-dir \
pip \
wheel && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
beautifulsoup4 \
beets==${BEETS_VERSION} \
beets-extrafiles \
@ -100,8 +97,9 @@ RUN \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
/tmp/* \
$HOME/.cache \
$HOME/.cargo
# environment settings
ENV BEETSDIR="/config" \

32
Dockerfile.aarch64
View file

@ -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
@ -10,21 +12,19 @@ LABEL maintainer="aptalca"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies --upgrade \
build-base \
cargo \
cmake \
ffmpeg-dev \
fftw-dev \
g++ \
gcc \
git \
jpeg-dev \
libpng-dev \
make \
mpg123-dev \
openjpeg-dev \
python3-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
curl \
expat \
ffmpeg \
ffmpeg-libs \
@ -34,7 +34,6 @@ RUN \
gst-plugins-good \
gstreamer \
jpeg \
jq \
lame \
libffi \
libpng \
@ -42,12 +41,9 @@ RUN \
nano \
openjpeg \
py3-gobject3 \
py3-pip \
py3-pylast \
python3 \
sqlite-libs \
tar \
wget && \
sqlite-libs && \
echo "**** compile mp3gain ****" && \
mkdir -p \
/tmp/mp3gain-src && \
@ -81,12 +77,13 @@ RUN \
make install && \
echo "**** install pip packages ****" && \
if [ -z ${BEETS_VERSION+x} ]; then \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json |jq -r '. | .info.version'); \
fi && \
python3 -m pip install --upgrade pip && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ \
wheel \
python3 -m ensurepip && \
pip3 install -U --no-cache-dir \
pip \
wheel && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
beautifulsoup4 \
beets==${BEETS_VERSION} \
beets-extrafiles \
@ -100,8 +97,9 @@ RUN \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
/tmp/* \
$HOME/.cache \
$HOME/.cargo
# environment settings
ENV BEETSDIR="/config" \

32
Dockerfile.armhf
View file

@ -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
@ -10,21 +12,19 @@ LABEL maintainer="aptalca"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies --upgrade \
build-base \
cargo \
cmake \
ffmpeg-dev \
fftw-dev \
g++ \
gcc \
git \
jpeg-dev \
libpng-dev \
make \
mpg123-dev \
openjpeg-dev \
python3-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
curl \
expat \
ffmpeg \
ffmpeg-libs \
@ -34,7 +34,6 @@ RUN \
gst-plugins-good \
gstreamer \
jpeg \
jq \
lame \
libffi \
libpng \
@ -42,12 +41,9 @@ RUN \
nano \
openjpeg \
py3-gobject3 \
py3-pip \
py3-pylast \
python3 \
sqlite-libs \
tar \
wget && \
sqlite-libs && \
echo "**** compile mp3gain ****" && \
mkdir -p \
/tmp/mp3gain-src && \
@ -81,12 +77,13 @@ RUN \
make install && \
echo "**** install pip packages ****" && \
if [ -z ${BEETS_VERSION+x} ]; then \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json \
|jq -r '. | .info.version'); \
BEETS_VERSION=$(curl -sL https://pypi.python.org/pypi/beets/json |jq -r '. | .info.version'); \
fi && \
python3 -m pip install --upgrade pip && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ \
wheel \
python3 -m ensurepip && \
pip3 install -U --no-cache-dir \
pip \
wheel && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
beautifulsoup4 \
beets==${BEETS_VERSION} \
beets-extrafiles \
@ -100,8 +97,9 @@ RUN \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
/tmp/* \
$HOME/.cache \
$HOME/.cargo
# environment settings
ENV BEETSDIR="/config" \

1
readme-vars.yml
View file

@ -52,6 +52,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "24.12.22:", desc: "Rebasing to alpine 3.17." }
- { date: "15.01.22:", desc: "Rebasing to alpine 3.15." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }

7
root/defaults/beets.sh
View file

@ -1,4 +1,5 @@
#!/bin/bash
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
#
# beets music tagger - post-processing script
#
@ -8,7 +9,7 @@
# $1 - Fullpath of directory to be processed. eg./mnt/user/downloads/some.artist_some.album
# $7 - Status of post processing. 0 = OK, 1 = failed verification, 2 = failed unpack, 3 = 1+2
if [ ! -z "$7" ] && [ "$7" -gt 0 ]; then
if [ -n "$7" ] && [ "$7" -gt 0 ]; then
echo "post-processing failed, bypassing script"
exit 1
fi
@ -16,7 +17,7 @@ fi
# process files
echo "--------------------------"
printf %b "$(date)\n"
echo "Starting beets.sh for $(basename $1)"
echo "Starting beets.sh for $(basename "$1")"
BEETSDIR=/config
export BEETSDIR

11
root/etc/cont-init.d/30-config
View file

@ -1,11 +0,0 @@
#!/usr/bin/with-contenv bash
# copy config
[[ ! -e /config/beets.sh ]] && \
cp /defaults/beets.sh /config/beets.sh
[[ ! -e /config/config.yaml ]] && \
cp /defaults/config.yaml /config/config.yaml
# permissions
chown -R abc:abc \
/config

0
root/etc/s6-overlay/s6-rc.d/init-beets-config/dependencies.d/init-config Normal file
View file

10
root/etc/s6-overlay/s6-rc.d/init-beets-config/run Executable file
View file

@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
# copy config
cp -n /defaults/beets.sh /config/beets.sh
cp -n /defaults/config.yaml /config/config.yaml
# permissions
lsiown -R abc:abc \
/config

1
root/etc/s6-overlay/s6-rc.d/init-beets-config/type Normal file
View file

@ -0,0 +1 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/init-beets-config/up Normal file
View file

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

0
root/etc/s6-overlay/s6-rc.d/svc-beets/dependencies.d/init-services Normal file
View file

1
root/etc/s6-overlay/s6-rc.d/svc-beets/notification-fd Normal file
View file

@ -0,0 +1 @@
3

6
root/etc/s6-overlay/s6-rc.d/svc-beets/run Executable file
View file

@ -0,0 +1,6 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \
s6-setuidgid abc beet web

1
root/etc/s6-overlay/s6-rc.d/svc-beets/type Normal file
View file

@ -0,0 +1 @@
longrun

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-beets-config Normal file
View file

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-beets Normal file
View file

5
root/etc/services.d/beets/run
View file

@ -1,5 +0,0 @@
#!/usr/bin/with-contenv bash
umask 022
exec \
s6-setuidgid abc beet web