Merge branch 'master' into 3.18

This commit is contained in:
Adam 2023-08-21 14:21:51 +01:00 committed by GitHub
commit bf98f5228d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 270 additions and 275 deletions

5
Jenkinsfile vendored
View file

@ -280,7 +280,7 @@ pipeline {
echo "Jenkinsfile is up to date."
fi
# Stage 2 - Delete old templates
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
for i in ${OLD_TEMPLATES}; do
if [[ -f "${i}" ]]; then
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@ -316,12 +316,13 @@ pipeline {
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
cd ${TEMPDIR}/repo/${LS_REPO}/
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
echo ".jenkins-external" >> .gitignore
git add .gitignore
fi
git add ${TEMPLATED_FILES}
git add readme-vars.yml ${TEMPLATED_FILES}
git commit -m 'Bot Updating Templated Files'
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}

View file

@ -244,7 +244,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
* **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).
* **24.02.23:** - Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin.
* **15.01.22:** - Rebasing to alpine 3.15.

View file

@ -1,29 +1,29 @@
NAME VERSION TYPE
Flask 2.3.2 python
Jinja2 3.1.2 python
MarkupSafe 2.1.2 python
Pillow 9.5.0 python
MarkupSafe 2.1.3 python
Pillow 10.0.0 python
PyGObject 3.44.1 python
PyYAML 6.0 python
PyYAML 6.0.1 python
Simple Launcher Executable 1.1.0.14 dotnet
Unidecode 1.3.6 python
Werkzeug 2.3.4 python
Werkzeug 2.3.7 python
alpine-baselayout 3.4.0-r0 apk
alpine-baselayout-data 3.4.0-r0 apk
alpine-keys 2.4-r1 apk
alpine-release 3.17.3-r0 apk
alpine-release 3.17.5-r0 apk
alsa-lib 1.2.8-r0 apk
anyio 3.6.2 python
anyio 3.7.1 python
aom-libs 3.5.0-r0 apk
apk-tools 2.12.10-r1 apk
audioread 3.0.0 python
bash 5.2.15-r0 apk
beautifulsoup4 4.12.2 python
beetcamp 0.16.3 python
beetcamp 0.17.2 python
beets 1.6.0 python
beets-extrafiles 0.0.7 python
blinker 1.6.2 python
brotli-libs 1.0.9-r9 apk
busybox 1.35.0 binary
busybox 1.35.0-r29 apk
busybox-binsh 1.35.0-r29 apk
ca-certificates 20230506-r0 apk
@ -31,17 +31,18 @@ ca-certificates-bundle 20230506-r0 apk
cairo 1.17.6-r3 apk
cairo-gobject 1.17.6-r3 apk
cdparanoia-libs 10.2-r11 apk
certifi 2023.5.7 python
charset-normalizer 3.1.0 python
certifi 2023.7.22 python
charset-normalizer 3.2.0 python
chromaprint 1.5.1-r2 apk
cjson 1.7.15-r3 apk
click 8.1.3 python
click 8.1.7 python
confuse 2.0.1 python
coreutils 9.1-r0 apk
curl 8.0.1-r0 apk
dbus-libs 1.14.4-r0 apk
curl 8.2.1-r0 apk
dbus-libs 1.14.8-r0 apk
discogs-client 2.3.0 python
eudev-libs 3.2.11-r4 apk
exceptiongroup 1.1.3 python
expat 2.5.0-r0 apk
ffmpeg 5.1.3-r0 apk
ffmpeg-libs 5.1.3-r0 apk
@ -56,7 +57,7 @@ freetype 2.12.1-r0 apk
fribidi 1.0.12-r0 apk
gdbm 1.23-r0 apk
gdk-pixbuf 2.42.10-r0 apk
glib 2.74.6-r0 apk
glib 2.74.7-r0 apk
gmp 6.2.1-r2 apk
gnutls 3.7.8-r3 apk
gobject-introspection 1.74.0-r1 apk
@ -67,13 +68,13 @@ gst-plugins-good 1.20.6-r0 apk
gstreamer 1.20.6-r0 apk
h11 0.14.0 python
harfbuzz 5.3.1-r1 apk
httpcore 0.17.1 python
httpcore 0.17.3 python
httpx 0.24.1 python
hwdata-pci 0.364-r0 apk
idna 3.4 python
itsdangerous 2.1.2 python
jack 1.9.21-r0 apk
jellyfish 0.11.2 python
jellyfish 1.0.0 python
jpeg 9e-r0 apk
jq 1.6-r2 apk
lame 3.100-r2 apk
@ -88,8 +89,8 @@ libbz2 1.0.8-r4 apk
libc-utils 0.7.2-r3 apk
libcaca 0.99_beta20-r0 apk
libcap2 2.66-r1 apk
libcrypto3 3.0.8-r4 apk
libcurl 8.1.0-r1 apk
libcrypto3 3.0.10-r0 apk
libcurl 8.2.1-r0 apk
libdav1d 1.0.0-r2 apk
libdrm 2.4.114-r0 apk
libdv 1.0.0-r7 apk
@ -107,7 +108,7 @@ libmd 1.0.4-r0 apk
libmount 2.38.1-r1 apk
libogg 1.3.5-r2 apk
libpciaccess 0.17-r0 apk
libpng 1.6.38-r0 apk
libpng 1.6.39-r0 apk
libproc 3.3.17-r2 apk
libpulse 16.1-r6 apk
libraw1394 2.1.2-r3 apk
@ -118,7 +119,7 @@ libsndfile 1.1.0-r2 apk
libsodium 1.0.18-r2 apk
libsrt 1.5.1-r0 apk
libssh 0.10.5-r0 apk
libssl3 3.0.8-r4 apk
libssl3 3.0.10-r0 apk
libstdc++ 12.2.1_git20220924-r4 apk
libtasn1 4.19.0-r0 apk
libtheora 1.1.1-r16 apk
@ -127,8 +128,8 @@ libva 2.16.0-r0 apk
libvdpau 1.5-r0 apk
libvorbis 1.3.7-r0 apk
libvpx 1.12.0-r1 apk
libwebp 1.2.4-r1 apk
libx11 1.8.4-r0 apk
libwebp 1.2.4-r2 apk
libx11 1.8.4-r1 apk
libxau 1.0.10-r0 apk
libxcb 1.15-r0 apk
libxdamage 1.1.5-r1 apk
@ -143,8 +144,8 @@ libxv 1.0.11-r3 apk
libxxf86vm 1.1.5-r0 apk
libzmq 4.3.4-r1 apk
linux-pam 1.5.2-r1 apk
mbedtls 2.28.3-r0 apk
mediafile 0.11.0 python
mbedtls 2.28.4-r0 apk
mediafile 0.12.0 python
mesa 22.2.5-r1 apk
mesa-egl 22.2.5-r1 apk
mesa-gbm 22.2.5-r1 apk
@ -156,14 +157,14 @@ mpg123-libs 1.31.1-r0 apk
munkres 1.1.4 python
musicbrainzngs 0.7.1 python
musl 1.2.3-r5 apk
musl-utils 1.2.3-r4 apk
musl-utils 1.2.3-r5 apk
mutagen 1.46.0 python
nano 7.0-r0 apk
ncurses-libs 6.3_p20221119-r0 apk
ncurses-terminfo-base 6.3_p20221119-r0 apk
ncurses-libs 6.3_p20221119-r1 apk
ncurses-terminfo-base 6.3_p20221119-r1 apk
netcat-openbsd 1.130-r4 apk
nettle 3.8.1-r0 apk
nghttp2-libs 1.51.0-r0 apk
nghttp2-libs 1.51.0-r1 apk
numactl 2.0.16-r1 apk
oauthlib 3.2.2 python
oniguruma 6.9.8-r0 apk
@ -174,18 +175,17 @@ ordered-set 4.1.0 python
p11-kit 0.24.1-r1 apk
pango 1.50.13-r0 apk
pcre2 10.42-r0 apk
pip 23.1.2 python
pip 23.2.1 python
pixman 0.42.2-r0 apk
pkgconf 1.9.4-r0 apk
procps 3.3.17-r2 apk
pyacoustid 1.2.2 python
pycairo 1.23.0 python
pycairo 1.24.0 python
pycountry 22.3.5 python
pylast 5.1.0 python
python 3.10.11 binary
python3 3.10.11-r0 apk
pylast 5.2.0 python
python3 3.10.12-r0 apk
readline 8.2.0-r0 apk
requests 2.30.0 python
requests 2.31.0 python
requests-oauthlib 1.3.1 python
scanelf 1.3.5-r1 apk
sdl2 2.26.5-r0 apk
@ -204,9 +204,9 @@ ssl_client 1.35.0-r29 apk
svt-av1-libs 1.3.0-r0 apk
taglib 1.13-r0 apk
tdb-libs 1.4.6-r0 apk
tiff 4.4.0-r3 apk
tiff 4.4.0-r4 apk
tzdata 2023c-r0 apk
urllib3 2.0.2 python
urllib3 2.0.4 python
utmps-libs 0.1.2.0-r1 apk
v4l-utils-libs 1.22.1-r2 apk
vidstab 1.1.0-r2 apk
@ -215,7 +215,7 @@ wayland-libs-client 1.21.0-r1 apk
wayland-libs-cursor 1.21.0-r1 apk
wayland-libs-egl 1.21.0-r1 apk
wayland-libs-server 1.21.0-r1 apk
wheel 0.40.0 python
wheel 0.41.1 python
x264-libs 0.164_git20220602-r0 apk
x265-libs 3.5-r3 apk
xvidcore 1.3.7-r1 apk

View file

@ -6,21 +6,17 @@ project_url: "http://beets.io/"
project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/beets-icon.png"
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a music library manager and not, for the most part, a music player. It does include a simple player plugin and an experimental Web-based player, but it generally leaves actual sound-reproduction to specialized tools."
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
project_blurb_optional_extras_enabled: false
project_blurb_optional_extras: []
# supported architectures
available_architectures:
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
# development version
development_versions: true
development_versions_items:
- {tag: "latest", desc: "Stable Beets Releases"}
- {tag: "nightly", desc: "Built against head of Beets git, generally considered unstable but a likely choice for power users of the application."}
# container parameters
common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
param_container_name: "{{ project_name }}"
@ -35,7 +31,6 @@ param_volumes:
param_usage_include_ports: true
param_ports:
- {external_port: "8337", internal_port: "8337", port_desc: "Application WebUI"}
# application setup block
app_setup_block_enabled: true
app_setup_block: |
@ -48,10 +43,9 @@ app_setup_block: |
See [Beets](http://beets.io/) for more info.
Contains [beets-extrafiles](https://github.com/Holzhaus/beets-extrafiles) plugin, [configuration details](https://github.com/Holzhaus/beets-extrafiles#usage)
# changelog
changelogs:
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- {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: "24.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin."}
- {date: "15.01.22:", desc: "Rebasing to alpine 3.15."}