diff --git a/Dockerfile b/Dockerfile index 47d6e80..ddc16ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -36,6 +36,7 @@ RUN \ gobject-introspection \ gst-plugins-good \ gstreamer \ + imagemagick \ jpeg \ lame \ libffi \ @@ -74,7 +75,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ beautifulsoup4 \ beets==${BEETS_VERSION} \ beets-extrafiles \ @@ -82,12 +83,12 @@ RUN \ discogs-client \ flask \ PyGObject \ - Pillow==9.5.0 \ pyacoustid \ pylast \ requests \ requests_oauthlib \ unidecode && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d37ba36..708ce09 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -37,6 +37,7 @@ RUN \ gobject-introspection \ gst-plugins-good \ gstreamer \ + imagemagick \ jpeg \ lame \ libffi \ @@ -75,7 +76,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ beautifulsoup4 \ beets==${BEETS_VERSION} \ beets-extrafiles \ @@ -83,12 +84,12 @@ RUN \ discogs-client \ flask \ PyGObject \ - Pillow==9.5.0 \ pyacoustid \ pylast \ requests \ requests_oauthlib \ unidecode && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index 5a4a159..924c2ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='8337' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 8e89bf1..a22859b 100644 --- a/README.md +++ b/README.md @@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **28.08.24:** - Rebase to Alpine 3.20, switch from Pillow to Imagemagick. * **23.12.23:** - Rebase to Alpine 3.19. * **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) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 1cf3fcb..ddcee36 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: pip_version release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - BUILD_VERSION_ARG = 'BEETS_VERSION' - EXT_PIP='beets' @@ -23,6 +22,6 @@ repo_vars: - CI_PORT='8337' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index e7f3bb1..215663b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,8 +6,6 @@ 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"} @@ -20,9 +18,6 @@ development_versions_items: # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional' param_container_name: "{{ project_name }}" -param_usage_include_env: true -param_env_vars: - - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } @@ -45,7 +40,8 @@ app_setup_block: | Contains [beets-extrafiles](https://github.com/Holzhaus/beets-extrafiles) plugin, [configuration details](https://github.com/Holzhaus/beets-extrafiles#usage) # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "28.08.24:", desc: "Rebase to Alpine 3.20, switch from Pillow to Imagemagick."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {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: "25.03.23:", desc: "Add requests_oauthlib required for [beatport plugin](https://beets.readthedocs.io/en/stable/plugins/beatport.html)."} diff --git a/root/defaults/beets.sh b/root/defaults/beets.sh index eeed21e..d660ea4 100644 --- a/root/defaults/beets.sh +++ b/root/defaults/beets.sh @@ -23,5 +23,5 @@ BEETSDIR=/config export BEETSDIR FPCALC=/usr/bin/fpcalc export FPCALC -/usr/bin/beet -v import -q "$1" +/lsiopy/bin/beet -v import -q "$1" diff --git a/root/etc/s6-overlay/s6-rc.d/init-beets-config/run b/root/etc/s6-overlay/s6-rc.d/init-beets-config/run index 423429d..3ae5607 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-beets-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-beets-config/run @@ -5,6 +5,8 @@ cp -n /defaults/beets.sh /config/beets.sh cp -n /defaults/config.yaml /config/config.yaml +chmod +x /config/beets.sh + # permissions lsiown -R abc:abc \ /config