diff --git a/.editorconfig b/.editorconfig index a92f7df..5f150f3 100755 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,6 @@ trim_trailing_whitespace = false indent_style = space indent_size = 2 -[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}] indent_style = space indent_size = 4 diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 571d76b..0eabb53 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-beets/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-beets/blob/nightly/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-beets/blob/nightly/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100644 index 0000000..2df6b61 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,9 @@ +name: Permission check +on: + pull_request: + paths: + - '**/run' + - '**/finish' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/Dockerfile b/Dockerfile index d2b0e81..7290daf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,6 @@ RUN \ tar xf \ /tmp/mp3val.tar.gz -C \ /tmp/mp3val-src --strip-components=1 && \ - git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \ git clone https://github.com/Holzhaus/beets-extrafiles.git /tmp/extrafiles-src FROM ghcr.io/linuxserver/baseimage-alpine:${ALPINE_VER} as beets_build-stage @@ -127,34 +126,6 @@ RUN \ make -f Makefile.linux && \ cp -p mp3val /build/mp3val/usr/bin -FROM ghcr.io/linuxserver/baseimage-alpine:${ALPINE_VER} as chromaprint_build-stage - -############## chromaprint build stage ############## - -# copy artifacts from fetch stage -COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src - -# set workdir -WORKDIR /tmp/chromaprint-src - -# install build packages -RUN \ - apk add --no-cache \ - build-base \ - cmake \ - ffmpeg-dev \ - fftw-dev - -# build package -RUN \ - set -ex && \ - cmake \ - -DBUILD_TOOLS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr && \ - make && \ - make DESTDIR=/build/chromaprint install - FROM ghcr.io/linuxserver/baseimage-alpine:${ALPINE_VER} as pip-stage ############## pip packages install stage ############## @@ -174,6 +145,7 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + beetcamp \ confuse \ discogs-client \ enum34 \ @@ -189,7 +161,6 @@ FROM ghcr.io/linuxserver/baseimage-alpine:${ALPINE_VER} as strip-stage # copy artifacts build stages COPY --from=beets_build-stage /build/beets/usr/ /build/all//usr/ -COPY --from=chromaprint_build-stage /build/chromaprint/usr/ /build/all//usr/ COPY --from=mp3gain_build-stage /build/mp3gain/usr/ /build/all//usr/ COPY --from=mp3val_build-stage /build/mp3val/usr/ /build/all//usr/ COPY --from=pip-stage /usr/lib/python3.10/site-packages /build/all/usr/lib/python3.10/site-packages @@ -228,6 +199,7 @@ COPY --from=strip-stage /build/all/usr/ /usr/ # install runtime packages RUN \ apk add --no-cache \ + chromaprint \ ffmpeg \ fftw \ flac \ @@ -236,7 +208,6 @@ RUN \ mpg123 \ nano \ lame \ - nano \ py3-beautifulsoup4 \ py3-flask \ py3-gobject3 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 114c2a7..58ee149 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -45,7 +45,6 @@ RUN \ tar xf \ /tmp/mp3val.tar.gz -C \ /tmp/mp3val-src --strip-components=1 && \ - git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \ git clone https://github.com/Holzhaus/beets-extrafiles.git /tmp/extrafiles-src FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-${ALPINE_VER} as beets_build-stage @@ -127,34 +126,6 @@ RUN \ make -f Makefile.linux && \ cp -p mp3val /build/mp3val/usr/bin -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-${ALPINE_VER} as chromaprint_build-stage - -############## chromaprint build stage ############## - -# copy artifacts from fetch stage -COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src - -# set workdir -WORKDIR /tmp/chromaprint-src - -# install build packages -RUN \ - apk add --no-cache \ - build-base \ - cmake \ - ffmpeg-dev \ - fftw-dev - -# build package -RUN \ - set -ex && \ - cmake \ - -DBUILD_TOOLS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr && \ - make && \ - make DESTDIR=/build/chromaprint install - FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-${ALPINE_VER} as pip-stage ############## pip packages install stage ############## @@ -174,6 +145,7 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + beetcamp \ confuse \ discogs-client \ enum34 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 46a6b53..f059de6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -45,7 +45,6 @@ RUN \ tar xf \ /tmp/mp3val.tar.gz -C \ /tmp/mp3val-src --strip-components=1 && \ - git clone https://bitbucket.org/acoustid/chromaprint.git /tmp/chromaprint-src && \ git clone https://github.com/Holzhaus/beets-extrafiles.git /tmp/extrafiles-src FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-${ALPINE_VER} as beets_build-stage @@ -127,34 +126,6 @@ RUN \ make -f Makefile.linux && \ cp -p mp3val /build/mp3val/usr/bin -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-${ALPINE_VER} as chromaprint_build-stage - -############## chromaprint build stage ############## - -# copy artifacts from fetch stage -COPY --from=fetch-stage /tmp/chromaprint-src /tmp/chromaprint-src - -# set workdir -WORKDIR /tmp/chromaprint-src - -# install build packages -RUN \ - apk add --no-cache \ - build-base \ - cmake \ - ffmpeg-dev \ - fftw-dev - -# build package -RUN \ - set -ex && \ - cmake \ - -DBUILD_TOOLS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr && \ - make && \ - make DESTDIR=/build/chromaprint install - FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-${ALPINE_VER} as pip-stage ############## pip packages install stage ############## @@ -174,6 +145,7 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + beetcamp \ confuse \ discogs-client \ enum34 \ diff --git a/Jenkinsfile b/Jenkinsfile index 012813f..763e390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -69,7 +69,7 @@ pipeline { script{ env.LS_TAG_NUMBER = sh( script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) + tagsha=$(git rev-list -n 1 nightly-${LS_RELEASE} 2>/dev/null) if [ "${tagsha}" == "${COMMIT_SHA}" ]; then echo ${LS_RELEASE_NUMBER} elif [ -z "${GIT_COMMIT}" ]; then @@ -815,19 +815,19 @@ pipeline { echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-nightly - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-nightly - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-nightly docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-nightly docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-nightly docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -835,13 +835,13 @@ pipeline { docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-nightly - docker push ${MANIFESTIMAGE}:arm32v7-nightly - docker push ${MANIFESTIMAGE}:arm64v8-nightly docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-nightly + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-nightly docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-nightly docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -987,12 +987,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } diff --git a/README.md b/README.md index 9ac8099..6cc97f9 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\ | | arm64 | ✅ | arm64v8-\ | -| armhf| ✅ | arm32v7-\ | - +| armhf | ✅ | arm32v7-\ | ## Usage @@ -75,7 +74,7 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Etc/UTC volumes: - :/config - :/music @@ -92,13 +91,14 @@ docker run -d \ --name=beets \ -e PUID=1000 \ -e PGID=1000 \ - -e TZ=Europe/London \ + -e TZ=Etc/UTC \ -p 8337:8337 \ -v :/config \ -v :/music \ -v :/downloads \ --restart unless-stopped \ lscr.io/linuxserver/beets:nightly + ``` ## Parameters @@ -110,7 +110,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 8337` | Application WebUI | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | -| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | +| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-v /config` | Configuration files. | | `-v /music` | Music library | | `-v /downloads` | Non processed music | @@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.12.22:** - Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos. * **15.01.22:** - Rebase to Alpine 3.15. * **02.06.21:** - Add back gstreamer packages. * **24.05.21:** - Add missing changes from master branch. diff --git a/readme-vars.yml b/readme-vars.yml index 1ec5ef0..affb6c0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,7 +33,7 @@ param_ports: # changelog changelogs: - - { date: "24.12.22:", desc: "Rebasing to alpine 3.17." } + - { date: "24.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, install chromaprint from Alpine repos, add beetcamp plugin." } - { date: "15.01.22:", desc: "Rebase to Alpine 3.15." } - { date: "02.06.21:", desc: "Add back gstreamer packages." } - { date: "24.05.21:", desc: "Add missing changes from master branch." }