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

Merge pull request #103 from linuxserver/3.18

Browse source
This commit is contained in:
Adam 2023-08-21 19:11:25 +01:00 committed by GitHub
commit 74dfd9d14a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.17 FROM ghcr.io/linuxserver/baseimage-alpine:3.18
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -11,7 +11,7 @@ LABEL maintainer="aptalca"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies --upgrade \ apk add --no-cache --virtual=build-dependencies \
build-base \ build-base \
cairo-dev \ cairo-dev \
cargo \ cargo \
@ -26,7 +26,7 @@ RUN \
openjpeg-dev \ openjpeg-dev \
python3-dev && \ python3-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \ apk add --no-cache \
chromaprint \ chromaprint \
expat \ expat \
ffmpeg \ ffmpeg \
@ -70,11 +70,11 @@ RUN \
if [ -z ${BEETS_VERSION+x} ]; then \ 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 && \ fi && \
python3 -m ensurepip && \ python3 -m venv /lsiopy && \
pip3 install -U --no-cache-dir \ pip install -U --no-cache-dir \
pip \ pip \
wheel && \ wheel && \
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 \ beautifulsoup4 \
beets==${BEETS_VERSION} \ beets==${BEETS_VERSION} \
beets-extrafiles \ beets-extrafiles \
@ -82,7 +82,7 @@ RUN \
discogs-client \ discogs-client \
flask \ flask \
PyGObject \ PyGObject \
pillow \ Pillow==9.5.0 \
pyacoustid \ pyacoustid \
pylast \ pylast \
requests \ requests \

14
Dockerfile.aarch64
View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # 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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -11,7 +11,7 @@ LABEL maintainer="aptalca"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies --upgrade \ apk add --no-cache --virtual=build-dependencies \
build-base \ build-base \
cairo-dev \ cairo-dev \
cargo \ cargo \
@ -26,7 +26,7 @@ RUN \
openjpeg-dev \ openjpeg-dev \
python3-dev && \ python3-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \ apk add --no-cache \
chromaprint \ chromaprint \
expat \ expat \
ffmpeg \ ffmpeg \
@ -71,11 +71,11 @@ RUN \
if [ -z ${BEETS_VERSION+x} ]; then \ 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 && \ fi && \
python3 -m ensurepip && \ python3 -m venv /lsiopy && \
pip3 install -U --no-cache-dir \ pip install -U --no-cache-dir \
pip \ pip \
wheel && \ wheel && \
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 \ beautifulsoup4 \
beets==${BEETS_VERSION} \ beets==${BEETS_VERSION} \
beets-extrafiles \ beets-extrafiles \
@ -83,7 +83,7 @@ RUN \
discogs-client \ discogs-client \
flask \ flask \
PyGObject \ PyGObject \
pillow \ Pillow==9.5.0 \
pyacoustid \ pyacoustid \
pylast \ pylast \
requests \ requests \

1
README.md
View file

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

1
jenkins-vars.yml
View file

@ -6,6 +6,7 @@ external_type: pip_version
release_type: stable release_type: stable
release_tag: latest release_tag: latest
ls_branch: master ls_branch: master
build_armhf: false
repo_vars: repo_vars:
- BUILD_VERSION_ARG = 'BEETS_VERSION' - BUILD_VERSION_ARG = 'BEETS_VERSION'
- EXT_PIP='beets' - EXT_PIP='beets'

1
readme-vars.yml
View file

@ -45,6 +45,7 @@ app_setup_block: |
Contains [beets-extrafiles](https://github.com/Holzhaus/beets-extrafiles) plugin, [configuration details](https://github.com/Holzhaus/beets-extrafiles#usage) Contains [beets-extrafiles](https://github.com/Holzhaus/beets-extrafiles) plugin, [configuration details](https://github.com/Holzhaus/beets-extrafiles#usage)
# changelog # changelog
changelogs: changelogs:
- {date: "25.08.23:", desc: "Rebase to Alpine 3.18, pin Pillow to 9.5.0."}
- {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "07.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: "25.03.23:", desc: "Add requests_oauthlib required for [beatport plugin](https://beets.readthedocs.io/en/stable/plugins/beatport.html)."}
- {date: "24.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin."} - {date: "24.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin."}