From b7577843d186d7fc5b9c60687b1390c90b1f2e9e Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 23 Sep 2018 22:28:45 -0700 Subject: [PATCH 001/525] adding the development branch and tag to the project to build off of the latest commit of the bazarr development branch --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- Jenkinsfile | 51 +++++++++++++++++++++++----------------------- README.md | 5 +++++ readme-vars.yml | 9 ++++++++ 6 files changed, 46 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3d89de..9657f18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ LABEL maintainer="chbmb" RUN \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f65aa8a..b0205f4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,8 +13,8 @@ LABEL maintainer="chbmb" RUN \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 555e2c3..904398a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -13,8 +13,8 @@ LABEL maintainer="chbmb" RUN \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Jenkinsfile b/Jenkinsfile index 080650a..a042c92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { } // Configuraiton for the variables used for this specific repo environment { - EXT_GIT_BRANCH = 'master' + EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' BUILD_VERSION_ARG = 'BAZARR_VERSION' @@ -83,28 +83,28 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ + // If this is a github commit trigger determine the current commit at head + stage("Set ENV github_commit"){ steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', returnStdout: true).trim() } } } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ + // If this is a github commit trigger Set the external release link + stage("Set ENV commit_link"){ steps{ script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE } } - } +} // If this is a master build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "development" environment name: 'CHANGE_ID', value: '' } steps { @@ -122,7 +122,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "master"} + not {branch "development"} environment name: 'CHANGE_ID', value: '' } steps { @@ -355,8 +355,8 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" + sh "docker push ${IMAGE}:development" sh "docker push ${IMAGE}:${META_TAG}" } } @@ -385,24 +385,24 @@ pipeline { docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" + sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development" + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-development" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development" sh "docker push ${IMAGE}:amd64-${META_TAG}" sh "docker push ${IMAGE}:arm32v6-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-latest" - sh "docker push ${IMAGE}:arm32v6-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant armv8" + sh "docker push ${IMAGE}:amd64-development" + sh "docker push ${IMAGE}:arm32v6-development" + sh "docker push ${IMAGE}:arm64v8-development" + sh "docker manifest push --purge ${IMAGE}:development || :" + sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v6-development ${IMAGE}:arm64v8-development" + sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v6-development --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant armv8" sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant armv8" - sh "docker manifest push --purge ${IMAGE}:latest" + sh "docker manifest push --purge ${IMAGE}:development" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" } } @@ -410,7 +410,7 @@ pipeline { // If this is a public release tag it in the LS Github and push a changelog from external repo and our internal one stage('Github-Tag-Push-Release') { when { - branch "master" + branch "development" expression { env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER } @@ -426,9 +426,10 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "master",\ + "prerelease": true,\ "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json diff --git a/README.md b/README.md index 113b7d4..6d9b683 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,11 @@ docker create \ linuxserver/bazarr ``` +You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. +Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development +The development tag will be the latest commit in the development branch of bazarr. +HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!! + ### docker-compose diff --git a/readme-vars.yml b/readme-vars.yml index 91b547a..2f7c69a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -13,6 +13,15 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} +# Optional Block +optional_block_1: true +optional_block_1_items: + - | + You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. + Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development + The development tag will be the latest commit in the development branch of bazarr. + HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!! + # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true From a48c12b2f64404cb612e63c180c5d7077f2c9315 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 23 Sep 2018 22:44:12 -0700 Subject: [PATCH 002/525] updating release tagging logic for the development branch to link to development and tag properly as a prerelease --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a042c92..72eca0c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -421,18 +421,17 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\ + "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ - "prerelease": true,\ + "target_commitish": "development",\ "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } From dc652f16427e83c2a479354227575d0422405736 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 23 Sep 2018 23:20:35 -0700 Subject: [PATCH 003/525] in order to properly increment the LinuxServer version number we need to compare and increment on the latest pre-release not stable release --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72eca0c..a215b63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { steps{ script{ env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq 'first(.[] | select(.prerelease == true)) | .tag_name' ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', From 71a88c27378be28d43871c6f411e2989118a26f5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 23 Sep 2018 23:26:38 -0700 Subject: [PATCH 004/525] need to use the array endpoint not the latest release to index the releases --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a215b63..81b396b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { steps{ script{ env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq 'first(.[] | select(.prerelease == true)) | .tag_name' ''', + script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', From 2d22678cdd4cb756ca16278f84e8ae526e956ad1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 2 Nov 2018 00:08:49 -0700 Subject: [PATCH 005/525] adding updated build logic for package tagging to repo --- Jenkinsfile | 299 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 200 insertions(+), 99 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 81b396b..df6da29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,10 @@ pipeline { agent { label 'X86-64-MULTI' } + // Input to determine if this is a package check + parameters { + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + } // Configuraiton for the variables used for this specific repo environment { EXT_GIT_BRANCH = 'development' @@ -33,6 +37,7 @@ pipeline { stage("Set ENV Variables base"){ steps{ script{ + env.EXIT_STATUS = '' env.LS_RELEASE = sh( script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', returnStdout: true).trim() @@ -72,11 +77,22 @@ pipeline { /* ####################### Package Version Tagging ####################### */ - // If this does not track package tags - stage("Set Package tag None"){ + // Grab the current package versions in Git to determine package tag + stage("Set Package tag"){ steps{ script{ - env.PACKAGE_TAG = 'none' + env.PACKAGE_TAG = sh( + script: '''#!/bin/bash + http_code=$(curl --write-out %{http_code} -s -o /dev/null \ + https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt) + if [[ "${http_code}" -ne 200 ]] ; then + echo none + else + curl -s \ + https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt \ + | md5sum | cut -c1-8 + fi''', + returnStdout: true).trim() } } } @@ -95,12 +111,12 @@ pipeline { } // If this is a github commit trigger Set the external release link stage("Set ENV commit_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE - } - } -} + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE + } + } + } // If this is a master build use live docker endpoints stage("Set ENV live build"){ when { @@ -202,92 +218,165 @@ pipeline { } steps { script{ - env.CI_URL = 'README_UPDATE' - env.RELEASE_LINK = 'README_UPDATE' - currentBuild.rawBuild.result = Result.ABORTED - throw new hudson.AbortException('ABORTED_README') + env.EXIT_STATUS = 'ABORTED' } } } /* ############### Build Container ############### */ - // Build Docker container for push to LS Repo - stage('Build-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - } - steps { - sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - // Build MultiArch Docker containers for push to LS Repo - stage('Build-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - } - parallel { - stage('Build X86') { - steps { - sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" - sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - } - } - } - stage('Build ARM64') { - agent { - label 'ARM64' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" - sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - } - } - } - } + // Build Docker container for push to LS Repo + stage('Build-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + // Build MultiArch Docker containers for push to LS Repo + stage('Build-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + parallel { + stage('Build X86') { + steps { + sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + stage('Build ARMHF') { + agent { + label 'ARMHF' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + stage('Build ARM64') { + agent { + label 'ARM64' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + } + } + // Take the image we just built and dump package versions for comparison + stage('Update-packages') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''#! /bin/bash + TEMPDIR=$(mktemp -d) + if [ "${MULTIARCH}" == "true" ]; then + LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} + else + LOCAL_CONTAINER=${IMAGE}:${META_TAG} + fi + if [ "${DIST_IMAGE}" == "alpine" ]; then + docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apk info > packages && \ + apk info -v > versions && \ + paste -d " " packages versions > /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "ubuntu" ]; then + docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + fi + if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} + cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ + cd ${TEMPDIR}/${LS_REPO}/ + git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt + git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' + git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + fi + rm -Rf ${TEMPDIR}''' + script{ + env.PACKAGE_UPDATED = sh( + script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the package file was just updated + stage('PACKAGE-exit') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + // Exit the build if this is just a package check and there are no changes to push + stage('PACKAGECHECK-exit') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'false' + environment name: 'EXIT_STATUS', value: '' + expression { + params.PACKAGE_CHECK == 'true' + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } /* ####### Testing ####### */ @@ -295,6 +384,7 @@ pipeline { stage('Test') { when { environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -320,7 +410,7 @@ pipeline { -e BASE=\"${DIST_IMAGE}\" \ -e SECRET_KEY=\"${DO_SECRET}\" \ -e ACCESS_KEY=\"${DO_KEY}\" \ - -e DOCKER_ENV=\"DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}\" \ + -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ @@ -341,6 +431,7 @@ pipeline { stage('Docker-Push-Single') { when { environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -365,6 +456,7 @@ pipeline { stage('Docker-Push-Multi') { when { environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -415,6 +507,7 @@ pipeline { env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER } environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' } steps { echo "Pushing New tag for current commit ${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" @@ -440,6 +533,7 @@ pipeline { stage('Sync-README') { when { environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -467,15 +561,22 @@ pipeline { Send status to Discord ###################### */ post { - success { - sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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} ''' - } - failure { - sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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} ''' + always { + script{ + if (env.EXIT_STATUS == "ABORTED"){ + sh 'echo "build aborted"' + } + else if (currentBuild.currentResult == "SUCCESS"){ + sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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 --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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} ''' + } + } } } } From 0ad61c58a590cc0fee44cb23135802d9ea6336a9 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 2 Nov 2018 00:20:08 -0700 Subject: [PATCH 006/525] forgot to add env variables to the ci run --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index df6da29..2f1d8be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,7 @@ pipeline { CI_PORT='6767' CI_SSL='false' CI_DELAY='120' + CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='user:password' CI_WEBPATH='' } From 504a468b8a54379a76a0c797a502e0724a090ca1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 3 Dec 2018 20:12:39 -0800 Subject: [PATCH 007/525] adding build logic templating to repository on development --- Jenkinsfile | 579 ++---------------------------------------------- jenkins-var.yml | 31 +++ 2 files changed, 51 insertions(+), 559 deletions(-) create mode 100644 jenkins-var.yml diff --git a/Jenkinsfile b/Jenkinsfile index 2f1d8be..29f91bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,183 +2,19 @@ pipeline { agent { label 'X86-64-MULTI' } - // Input to determine if this is a package check - parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') - } - // Configuraiton for the variables used for this specific repo + // Configuration for the variables used for this specific repo environment { - EXT_GIT_BRANCH = 'development' - EXT_USER = 'morpheus65535' - EXT_REPO = 'bazarr' - BUILD_VERSION_ARG = 'BAZARR_VERSION' - LS_USER = 'linuxserver' - LS_REPO = 'docker-bazarr' - CONTAINER_NAME = 'bazarr' - DOCKERHUB_IMAGE = 'linuxserver/bazarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr' - BUILDS_DISCORD = credentials('build_webhook_url') - GITHUB_TOKEN = credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') - DIST_IMAGE = 'alpine' - DIST_TAG = '3.8' - DIST_PACKAGES = 'none' - MULTIARCH='true' - CI='true' - CI_WEB='true' - CI_PORT='6767' - CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - CI_WEBPATH='' + LS_USER='linuxserver' + LS_REPO='docker-bazarr' + CONTAINER_NAME='bazarr' + GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') } stages { - // Setup all the basic environment variables needed for the build - stage("Set ENV Variables base"){ - steps{ - script{ - env.EXIT_STATUS = '' - env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', - returnStdout: true).trim() - env.LS_RELEASE_NOTES = sh( - script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', - returnStdout: true).trim() - env.GITHUB_DATE = sh( - script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', - returnStdout: true).trim() - env.COMMIT_SHA = sh( - script: '''git rev-parse HEAD''', - returnStdout: true).trim() - 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 - } - script{ - env.LS_RELEASE_NUMBER = sh( - script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', - returnStdout: true).trim() - } - script{ - env.LS_TAG_NUMBER = sh( - script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) - if [ "${tagsha}" == "${COMMIT_SHA}" ]; then - echo ${LS_RELEASE_NUMBER} - elif [ -z "${GIT_COMMIT}" ]; then - echo ${LS_RELEASE_NUMBER} - else - echo $((${LS_RELEASE_NUMBER} + 1)) - fi''', - returnStdout: true).trim() - } - } - } - /* ####################### - Package Version Tagging - ####################### */ - // Grab the current package versions in Git to determine package tag - stage("Set Package tag"){ - steps{ - script{ - env.PACKAGE_TAG = sh( - script: '''#!/bin/bash - http_code=$(curl --write-out %{http_code} -s -o /dev/null \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt) - if [[ "${http_code}" -ne 200 ]] ; then - echo none - else - curl -s \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt \ - | md5sum | cut -c1-8 - fi''', - returnStdout: true).trim() - } - } - } - /* ######################## - External Release Tagging - ######################## */ - // If this is a github commit trigger determine the current commit at head - stage("Set ENV github_commit"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', - returnStdout: true).trim() - } - } - } - // If this is a github commit trigger Set the external release link - stage("Set ENV commit_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE - } - } - } - // If this is a master build use live docker endpoints - stage("Set ENV live build"){ + // Use helper containers to render templated files + stage('Update-Templates') { when { branch "development" environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DOCKERHUB_IMAGE - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER - } else { - env.CI_TAGS = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER - } - env.META_TAG = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER - } - } - } - // If this is a dev build use dev docker endpoints - stage("Set ENV dev build"){ - when { - not {branch "development"} - environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DEV_DOCKERHUB_IMAGE - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } - env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' - } - } - } - // If this is a pull request build use dev docker endpoints - stage("Set ENV PR build"){ - when { - not {environment name: 'CHANGE_ID', value: ''} - } - steps { - script{ - env.IMAGE = env.PR_DOCKERHUB_IMAGE - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } - env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' - } - } - } - // Use helper container to render a readme from the template if needed - stage('Update-README') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null } @@ -186,397 +22,22 @@ pipeline { steps { sh '''#! /bin/bash TEMPDIR=$(mktemp -d) + docker pull linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest - if [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/${LS_REPO}/ - cd ${TEMPDIR}/${LS_REPO}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git add README.md - git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating README from template' - git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development + cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + cd ${TEMPDIR}/repo/${LS_REPO}/ + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all fi rm -Rf ${TEMPDIR}''' - script{ - env.README_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the Readme was just updated - stage('README-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'README_UPDATED', value: 'true' - expression { - env.CONTAINER_NAME != null - } - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - /* ############### - Build Container - ############### */ - // Build Docker container for push to LS Repo - stage('Build-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - // Build MultiArch Docker containers for push to LS Repo - stage('Build-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - parallel { - stage('Build X86') { - steps { - sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - } - } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" - sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - } - } - } - stage('Build ARM64') { - agent { - label 'ARM64' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" - sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - } - } - } - } - // Take the image we just built and dump package versions for comparison - stage('Update-packages') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then - LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} - else - LOCAL_CONTAINER=${IMAGE}:${META_TAG} - fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ - apk info > packages && \ - apk info -v > versions && \ - paste -d " " packages versions > /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' - fi - if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ - cd ${TEMPDIR}/${LS_REPO}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt - git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' - git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - fi - rm -Rf ${TEMPDIR}''' - script{ - env.PACKAGE_UPDATED = sh( - script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the package file was just updated - stage('PACKAGE-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - // Exit the build if this is just a package check and there are no changes to push - stage('PACKAGECHECK-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'false' - environment name: 'EXIT_STATUS', value: '' - expression { - params.PACKAGE_CHECK == 'true' - } - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - /* ####### - Testing - ####### */ - // Run Container tests - stage('Test') { - when { - environment name: 'CI', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') - ]) { - sh '''#! /bin/bash - docker pull lsiodev/ci:latest - if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ - -e TAGS=\"${CI_TAGS}\" \ - -e META_TAG=\"${META_TAG}\" \ - -e PORT=\"${CI_PORT}\" \ - -e SSL=\"${CI_SSL}\" \ - -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ - -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ - -e WEB_SCREENSHOT=\"${CI_WEB}\" \ - -e WEB_AUTH=\"${CI_AUTH}\" \ - -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ - -t lsiodev/ci:latest \ - python /ci/ci.py''' - script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - } - } - } - } - /* ################## - Release Logic - ################## */ - // If this is an amd64 only image only push a single image - stage('Docker-Push-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" - sh "docker push ${IMAGE}:development" - sh "docker push ${IMAGE}:${META_TAG}" - } - } - } - // If this is a multi arch release push all images and define the manifest - stage('Docker-Push-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh '''#! /bin/bash - if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-development" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development" - sh "docker push ${IMAGE}:amd64-${META_TAG}" - sh "docker push ${IMAGE}:arm32v6-${META_TAG}" - sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-development" - sh "docker push ${IMAGE}:arm32v6-development" - sh "docker push ${IMAGE}:arm64v8-development" - sh "docker manifest push --purge ${IMAGE}:development || :" - sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v6-development ${IMAGE}:arm64v8-development" - sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v6-development --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant armv8" - sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" - sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant armv8" - sh "docker manifest push --purge ${IMAGE}:development" - sh "docker manifest push --purge ${IMAGE}:${META_TAG}" - } - } - } - // If this is a public release tag it in the LS Github and push a changelog from external repo and our internal one - stage('Github-Tag-Push-Release') { - when { - branch "development" - expression { - env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER - } - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Pushing New tag for current commit ${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ - "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' - echo "Pushing New release for Tag" - sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "development",\ - "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": true}' >> releasebody.json - paste -d'\\0' start releasebody.json > releasebody.json.done - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' - } - } - // Use helper container to sync the current README on master to the dockerhub endpoint - stage('Sync-README') { - when { - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - docker pull lsiodev/readme-sync - docker run --rm=true \ - -e DOCKERHUB_USERNAME=$DOCKERUSER \ - -e DOCKERHUB_PASSWORD=$DOCKERPASS \ - -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ - -e DOCKER_REPOSITORY=${IMAGE} \ - -e GIT_BRANCH=master \ - lsiodev/readme-sync bash -c 'node sync' ''' - } - } - } - } - /* ###################### - Send status to Discord - ###################### */ - post { - always { - script{ - if (env.EXIT_STATUS == "ABORTED"){ - sh 'echo "build aborted"' - } - else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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 --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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/jenkins-var.yml b/jenkins-var.yml new file mode 100644 index 0000000..e122b38 --- /dev/null +++ b/jenkins-var.yml @@ -0,0 +1,31 @@ +--- + +# jenkins variables +project_name: docker-bazarr +external_type: github_commit +release_type: prerelease +release_tag: development +ls_branch: development +repo_vars: + - EXT_GIT_BRANCH = 'development' + - EXT_USER = 'morpheus65535' + - EXT_REPO = 'bazarr' + - BUILD_VERSION_ARG = 'BAZARR_VERSION' + - LS_USER = 'linuxserver' + - LS_REPO = 'docker-bazarr' + - CONTAINER_NAME = 'bazarr' + - DOCKERHUB_IMAGE = 'linuxserver/bazarr' + - DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr' + - PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr' + - DIST_IMAGE = 'alpine' + - DIST_TAG = '3.8' + - DIST_PACKAGES = 'none' + - MULTIARCH='true' + - CI='true' + - CI_WEB='true' + - CI_PORT='6767' + - CI_SSL='false' + - CI_DELAY='120' + - CI_DOCKERENV='TZ=US/Pacific' + - CI_AUTH='user:password' + - CI_WEBPATH='' From 5e5c71b4bf847df18ceadbca7773035c500e42e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Dec 2018 10:46:46 +0000 Subject: [PATCH 008/525] Bot Updating Templated Files --- Jenkinsfile | 8 ++++---- README.md | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29f91bc..a72f8a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "development" + branch "master" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -23,13 +23,13 @@ pipeline { sh '''#! /bin/bash TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout master cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ diff --git a/README.md b/README.md index 6d9b683..9327aae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Podcast](https://podcast.linuxserver.io) - on hiatus. Coming back soon (late 2018). +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). # PSA: Changes are happening @@ -21,6 +21,7 @@ From August 2018 onwards, Linuxserver are in the midst of switching to a new CI TLDR: Multi-arch support is changing from multiple repos to one repo per container image. # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) +[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg) @@ -32,13 +33,13 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain ## Supported Architectures -Our images support multiple architectures such as `X86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). The architectures supported by this image are: | Architecture | Tag | | :----: | --- | -| X86-64 | amd64-latest | +| x86-64 | amd64-latest | | arm64 | arm64v8-latest | | armhf | arm32v6-latest | @@ -57,7 +58,8 @@ docker create \ -p 6767:6767 \ -v :/config \ -v :/movies \ - -v :/tv \ + --restart unless-stopped \ linuxserver/bazarr ``` @@ -85,7 +87,7 @@ services: volumes: - :/config - :/movies - - :/tv ports: - 6767:6767 mem_limit: 4096m From e118866d74362b271e099125b8521b2ec912f6a8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 6 Dec 2018 11:18:07 -0500 Subject: [PATCH 009/525] Rename jenkins-var.yml to jenkins-vars.yml --- jenkins-var.yml => jenkins-vars.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkins-var.yml => jenkins-vars.yml (100%) diff --git a/jenkins-var.yml b/jenkins-vars.yml similarity index 100% rename from jenkins-var.yml rename to jenkins-vars.yml From 50a899d04b2e5a2d33d72e9415858dbd90cc54cd Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 7 Dec 2018 14:12:01 -0800 Subject: [PATCH 010/525] fixing build logic by templating from the jenkins variables --- Jenkinsfile | 562 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 555 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a72f8a7..ca2058f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,18 +2,182 @@ pipeline { agent { label 'X86-64-MULTI' } + // Input to determine if this is a package check + parameters { + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + } // Configuration for the variables used for this specific repo environment { - LS_USER='linuxserver' - LS_REPO='docker-bazarr' - CONTAINER_NAME='bazarr' + BUILDS_DISCORD=credentials('build_webhook_url') GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + EXT_GIT_BRANCH = 'development' + EXT_USER = 'morpheus65535' + EXT_REPO = 'bazarr' + BUILD_VERSION_ARG = 'BAZARR_VERSION' + LS_USER = 'linuxserver' + LS_REPO = 'docker-bazarr' + CONTAINER_NAME = 'bazarr' + DOCKERHUB_IMAGE = 'linuxserver/bazarr' + DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr' + PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr' + DIST_IMAGE = 'alpine' + DIST_TAG = '3.8' + DIST_PACKAGES = 'none' + MULTIARCH='true' + CI='true' + CI_WEB='true' + CI_PORT='6767' + CI_SSL='false' + CI_DELAY='120' + CI_DOCKERENV='TZ=US/Pacific' + CI_AUTH='user:password' + CI_WEBPATH='' } stages { + // Setup all the basic environment variables needed for the build + stage("Set ENV Variables base"){ + steps{ + script{ + env.EXIT_STATUS = '' + env.LS_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', + returnStdout: true).trim() + env.LS_RELEASE_NOTES = sh( + script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', + returnStdout: true).trim() + env.GITHUB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() + env.COMMIT_SHA = sh( + script: '''git rev-parse HEAD''', + returnStdout: true).trim() + 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 + } + script{ + env.LS_RELEASE_NUMBER = sh( + script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', + returnStdout: true).trim() + } + script{ + env.LS_TAG_NUMBER = sh( + script: '''#! /bin/bash + tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) + if [ "${tagsha}" == "${COMMIT_SHA}" ]; then + echo ${LS_RELEASE_NUMBER} + elif [ -z "${GIT_COMMIT}" ]; then + echo ${LS_RELEASE_NUMBER} + else + echo $((${LS_RELEASE_NUMBER} + 1)) + fi''', + returnStdout: true).trim() + } + } + } + /* ####################### + Package Version Tagging + ####################### */ + // Grab the current package versions in Git to determine package tag + stage("Set Package tag"){ + steps{ + script{ + env.PACKAGE_TAG = sh( + script: '''#!/bin/bash + http_code=$(curl --write-out %{http_code} -s -o /dev/null \ + https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt) + if [[ "${http_code}" -ne 200 ]] ; then + echo none + else + curl -s \ + https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt \ + | md5sum | cut -c1-8 + fi''', + returnStdout: true).trim() + } + } + } + /* ######################## + External Release Tagging + ######################## */ + // If this is a github commit trigger determine the current commit at head + stage("Set ENV github_commit"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', + returnStdout: true).trim() + } + } + } + // If this is a github commit trigger Set the external release link + stage("Set ENV commit_link"){ + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE + } + } + } + // If this is a development build use live docker endpoints + stage("Set ENV live build"){ + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + } else { + env.CI_TAGS = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + } + env.META_TAG = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + } + } + } + // If this is a dev build use dev docker endpoints + stage("Set ENV dev build"){ + when { + not {branch "development"} + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DEV_DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } else { + env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } + env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + } + } + } + // If this is a pull request build use dev docker endpoints + stage("Set ENV PR build"){ + when { + not {environment name: 'CHANGE_ID', value: ''} + } + steps { + script{ + env.IMAGE = env.PR_DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } else { + env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } + env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + } + } + } // Use helper containers to render templated files stage('Update-Templates') { when { - branch "master" + branch "development" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -21,23 +185,407 @@ pipeline { } steps { sh '''#! /bin/bash + set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout master + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the Templated files were just updated + stage('Template-exit') { + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'FILES_UPDATED', value: 'true' + expression { + env.CONTAINER_NAME != null + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ############### + Build Container + ############### */ + // Build Docker container for push to LS Repo + stage('Build-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + // Build MultiArch Docker containers for push to LS Repo + stage('Build-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + parallel { + stage('Build X86') { + steps { + sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + stage('Build ARMHF') { + agent { + label 'ARMHF' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + stage('Build ARM64') { + agent { + label 'ARM64' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + } + } + // Take the image we just built and dump package versions for comparison + stage('Update-packages') { + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + if [ "${MULTIARCH}" == "true" ]; then + LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} + else + LOCAL_CONTAINER=${IMAGE}:${META_TAG} + fi + if [ "${DIST_IMAGE}" == "alpine" ]; then + docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apk info > packages && \ + apk info -v > versions && \ + paste -d " " packages versions > /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "ubuntu" ]; then + docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + fi + if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development + cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ + cd ${TEMPDIR}/${LS_REPO}/ + git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt + git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' + git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + fi + rm -Rf ${TEMPDIR}''' + script{ + env.PACKAGE_UPDATED = sh( + script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the package file was just updated + stage('PACKAGE-exit') { + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + // Exit the build if this is just a package check and there are no changes to push + stage('PACKAGECHECK-exit') { + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'false' + environment name: 'EXIT_STATUS', value: '' + expression { + params.PACKAGE_CHECK == 'true' + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ####### + Testing + ####### */ + // Run Container tests + stage('Test') { + when { + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + string(credentialsId: 'spaces-key', variable: 'DO_KEY'), + string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + ]) { + sh '''#! /bin/bash + set -e + docker pull lsiodev/ci:latest + if [ "${MULTIARCH}" == "true" ]; then + docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} + docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e IMAGE=\"${IMAGE}\" \ + -e DELAY_START=\"${CI_DELAY}\" \ + -e TAGS=\"${CI_TAGS}\" \ + -e META_TAG=\"${META_TAG}\" \ + -e PORT=\"${CI_PORT}\" \ + -e SSL=\"${CI_SSL}\" \ + -e BASE=\"${DIST_IMAGE}\" \ + -e SECRET_KEY=\"${DO_SECRET}\" \ + -e ACCESS_KEY=\"${DO_KEY}\" \ + -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ + -e WEB_SCREENSHOT=\"${CI_WEB}\" \ + -e WEB_AUTH=\"${CI_AUTH}\" \ + -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e DO_REGION="ams3" \ + -e DO_BUCKET="lsio-ci" \ + -t lsiodev/ci:latest \ + python /ci/ci.py''' + script{ + env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + } + } + } + } + /* ################## + Release Logic + ################## */ + // If this is an amd64 only image only push a single image + stage('Docker-Push-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" + sh "docker push ${IMAGE}:development" + sh "docker push ${IMAGE}:${META_TAG}" + } + } + } + // If this is a multi arch release push all images and define the manifest + stage('Docker-Push-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh '''#! /bin/bash + if [ "${CI}" == "false" ]; then + docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} + docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi''' + sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development" + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-development" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development" + sh "docker push ${IMAGE}:amd64-${META_TAG}" + sh "docker push ${IMAGE}:arm32v6-${META_TAG}" + sh "docker push ${IMAGE}:arm64v8-${META_TAG}" + sh "docker push ${IMAGE}:amd64-development" + sh "docker push ${IMAGE}:arm32v6-development" + sh "docker push ${IMAGE}:arm64v8-development" + sh "docker manifest push --purge ${IMAGE}:development || :" + sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v6-development ${IMAGE}:arm64v8-development" + sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v6-development --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant v8" + sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" + sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" + sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" + sh "docker manifest push --purge ${IMAGE}:development" + sh "docker manifest push --purge ${IMAGE}:${META_TAG}" + } + } + } + // If this is a public release tag it in the LS Github + stage('Github-Tag-Push-Release') { + when { + branch "development" + expression { + env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER + } + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Pushing New tag for current commit ${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" + sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ + -d '{"tag":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "object": "'${COMMIT_SHA}'",\ + "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ + "type": "commit",\ + "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + echo "Pushing New release for Tag" + sh '''#! /bin/bash + curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "target_commitish": "development",\ + "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + printf '","draft": false,"prerelease": true}' >> releasebody.json + paste -d'\\0' start releasebody.json > releasebody.json.done + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' + } + } + // Use helper container to sync the current README on master to the dockerhub endpoint + stage('Sync-README') { + when { + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + docker pull lsiodev/readme-sync + docker run --rm=true \ + -e DOCKERHUB_USERNAME=$DOCKERUSER \ + -e DOCKERHUB_PASSWORD=$DOCKERPASS \ + -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ + -e DOCKER_REPOSITORY=${IMAGE} \ + -e GIT_BRANCH=master \ + lsiodev/readme-sync bash -c 'node sync' ''' + } + } + } + } + /* ###################### + Send status to Discord + ###################### */ + post { + always { + script{ + if (env.EXIT_STATUS == "ABORTED"){ + sh 'echo "build aborted"' + } + else if (currentBuild.currentResult == "SUCCESS"){ + sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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 --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_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} ''' + } } } } From bf99ad4787dbd1caa768cefa3aaf9fe5f9a08c88 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Dec 2018 22:15:49 +0000 Subject: [PATCH 011/525] Bot Updating Package Versions --- package_versions.txt | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package_versions.txt diff --git a/package_versions.txt b/package_versions.txt new file mode 100644 index 0000000..a58051e --- /dev/null +++ b/package_versions.txt @@ -0,0 +1,65 @@ +musl musl-1.1.19-r10 +busybox busybox-1.28.4-r1 +alpine-baselayout alpine-baselayout-3.1.0-r0 +alpine-keys alpine-keys-2.1-r1 +libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 +libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 +libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 +ssl_client ssl_client-1.28.4-r1 +zlib zlib-1.2.11-r1 +apk-tools apk-tools-2.10.1-r0 +scanelf scanelf-1.2.3-r0 +musl-utils musl-utils-1.1.19-r10 +libc-utils libc-utils-0.7.1-r0 +xz-libs xz-libs-5.2.4-r0 +xz xz-5.2.4-r0 +ca-certificates ca-certificates-20171114-r3 +ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1 +ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1 +ncurses-libs ncurses-libs-6.1_p20180818-r1 +readline readline-7.0.003-r0 +bash bash-4.4.19-r1 +libattr libattr-2.4.47-r7 +libacl libacl-2.2.52-r5 +coreutils coreutils-8.29-r2 +linux-pam linux-pam-1.3.0-r0 +shadow shadow-4.5-r0 +tzdata tzdata-2018f-r0 +libbz2 libbz2-1.0.6-r6 +libpng libpng-1.6.34-r1 +freetype freetype-2.9.1-r1 +libgcc libgcc-6.4.0-r9 +libstdc++ libstdc++-6.4.0-r9 +libjpeg-turbo libjpeg-turbo-1.5.3-r3 +tiff tiff-4.0.9-r7 +lcms2 lcms2-2.9-r1 +libffi libffi-3.2.1-r4 +libwebp libwebp-1.0.0-r0 +openjpeg openjpeg-2.3.0-r0 +libcrypto1.0 libcrypto1.0-1.0.2q-r0 +libssl1.0 libssl1.0-1.0.2q-r0 +expat expat-2.2.5-r0 +gdbm gdbm-1.13-r1 +sqlite-libs sqlite-libs-3.24.0-r0 +python2 python2-2.7.15-r1 +nghttp2-libs nghttp2-libs-1.32.0-r0 +libssh2 libssh2-1.8.0-r3 +libcurl libcurl-7.61.1-r1 +curl curl-7.61.1-r1 +pcre2 pcre2-10.31-r0 +git git-2.18.1-r0 +openssl openssl-1.0.2q-r0 +p7zip p7zip-16.02-r3 +libgpg-error libgpg-error-1.30-r0 +libgcrypt libgcrypt-1.8.3-r0 +libxml2 libxml2-2.9.8-r1 +libxslt libxslt-1.1.32-r0 +py2-lxml py2-lxml-4.2.2-r0 +py-setuptools py-setuptools-39.1.0-r0 +py2-pip py2-pip-10.0.1-r0 +tar tar-1.30-r0 +unrar unrar-5.6.4-r0 +unzip unzip-6.0-r4 +libgd libgd-2.2.5-r1 +vnstat vnstat-1.18-r0 +wget wget-1.19.5-r0 From e14e936f7b7824197e6c4070d48b0e3bde6776ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 9 Dec 2018 20:32:09 +0000 Subject: [PATCH 012/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a58051e..78d3a79 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,11 +1,11 @@ musl musl-1.1.19-r10 -busybox busybox-1.28.4-r1 +busybox busybox-1.28.4-r2 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 -ssl_client ssl_client-1.28.4-r1 +ssl_client ssl_client-1.28.4-r2 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 scanelf scanelf-1.2.3-r0 @@ -31,7 +31,7 @@ freetype freetype-2.9.1-r1 libgcc libgcc-6.4.0-r9 libstdc++ libstdc++-6.4.0-r9 libjpeg-turbo libjpeg-turbo-1.5.3-r3 -tiff tiff-4.0.9-r7 +tiff tiff-4.0.10-r0 lcms2 lcms2-2.9-r1 libffi libffi-3.2.1-r4 libwebp libwebp-1.0.0-r0 From 469d6c3044ae51f52bdb548ca48cfb750111cdcc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Dec 2018 22:15:02 +0000 Subject: [PATCH 013/525] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca2058f..a5343cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -327,12 +327,12 @@ pipeline { LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ apk info > packages && \ apk info -v > versions && \ paste -d " " packages versions > /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' fi if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then diff --git a/README.md b/README.md index 9327aae..81a9e9a 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ docker create \ -p 6767:6767 \ -v :/config \ -v :/movies \ - -v :/tv \ + -v :/config - :/movies - - :/tv + - Date: Tue, 18 Dec 2018 22:36:09 +0000 Subject: [PATCH 014/525] Add `gevent` New dependency of `gevent` following conversation with Morpheus (Bazarr dev) ``` this one cannot be directly included in bazarr libs and is a prerequisite to start using websocket. ``` --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9657f18..adebb01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ + echo "**** install packages ****" && \ + apk add --no-cache \ + py-gevent && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ From 229a1b6da054b3fd2aa6384bd541e32d88145aff Mon Sep 17 00:00:00 2001 From: chbmb Date: Tue, 18 Dec 2018 22:51:03 +0000 Subject: [PATCH 015/525] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b0205f4..ff5b33e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -11,6 +11,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ +echo "**** install packages ****" && \ + apk add --no-cache \ + py-gevent && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ From b0c47f1882ce643aebff2dab53c494bd85ccce63 Mon Sep 17 00:00:00 2001 From: chbmb Date: Tue, 18 Dec 2018 22:51:32 +0000 Subject: [PATCH 016/525] Update Dockerfile.armhf --- Dockerfile.armhf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 904398a..4999ef1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -11,6 +11,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="chbmb" RUN \ +echo "**** install packages ****" && \ + apk add --no-cache \ + py-gevent && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ From d7045f3187030e26afe236c99e5179dbed6c249b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Dec 2018 02:18:38 +0000 Subject: [PATCH 017/525] Bot Updating Package Versions --- package_versions.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 78d3a79..dff9ec9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,3 +63,7 @@ unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 vnstat vnstat-1.18-r0 wget wget-1.19.5-r0 +py-greenlet py-greenlet-0.4.13-r0 +py-gevent py-gevent-1.2.2-r0 +py2-greenlet py2-greenlet-0.4.13-r0 +py2-gevent py2-gevent-1.2.2-r0 From d73d6ae96fff534c95fb7664575c23dead47c2cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Dec 2018 12:30:17 +0000 Subject: [PATCH 018/525] Bot Updating Templated Files --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5343cc..6f74928 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -330,10 +330,12 @@ pipeline { docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ apk info > packages && \ apk info -v > versions && \ - paste -d " " packages versions > /tmp/package_versions.txt' + paste -d " " packages versions > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} From 397d0eba27edcac9c6c427cd965bc5eb7ef58ea6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Jan 2019 03:44:50 +0000 Subject: [PATCH 019/525] Bot Updating Templated Files --- Jenkinsfile | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f74928..daa8c08 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,6 +118,16 @@ pipeline { } } } + // Sanitize the release tag and strip illegal docker or github characters + stage("Sanitize tag"){ + steps{ + script{ + env.EXT_RELEASE_CLEAN = sh( + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:]//g' ''', + returnStdout: true).trim() + } + } + } // If this is a development build use live docker endpoints stage("Set ENV live build"){ when { @@ -128,11 +138,11 @@ pipeline { script{ env.IMAGE = env.DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { - env.CI_TAGS = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } - env.META_TAG = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } } } @@ -146,11 +156,11 @@ pipeline { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } - env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -164,11 +174,11 @@ pipeline { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } - env.META_TAG = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -402,6 +412,9 @@ pipeline { string(credentialsId: 'spaces-key', variable: 'DO_KEY'), string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') ]) { + script{ + env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + } sh '''#! /bin/bash set -e docker pull lsiodev/ci:latest @@ -430,9 +443,6 @@ pipeline { -e DO_BUCKET="lsio-ci" \ -t lsiodev/ci:latest \ python /ci/ci.py''' - script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - } } } } @@ -502,7 +512,7 @@ pipeline { sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v6-development ${IMAGE}:arm64v8-development" sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v6-development --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" + sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" @@ -516,25 +526,25 @@ pipeline { when { branch "development" expression { - env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER + env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER } environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "development",\ - "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done From e1e92efbd290716f70915f54251b9eef8eaf9db4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Jan 2019 16:10:00 +0000 Subject: [PATCH 020/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dff9ec9..216707c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,11 +1,11 @@ musl musl-1.1.19-r10 -busybox busybox-1.28.4-r2 +busybox busybox-1.28.4-r3 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 -ssl_client ssl_client-1.28.4-r2 +ssl_client ssl_client-1.28.4-r3 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 scanelf scanelf-1.2.3-r0 @@ -35,12 +35,12 @@ tiff tiff-4.0.10-r0 lcms2 lcms2-2.9-r1 libffi libffi-3.2.1-r4 libwebp libwebp-1.0.0-r0 -openjpeg openjpeg-2.3.0-r0 +openjpeg openjpeg-2.3.0-r1 libcrypto1.0 libcrypto1.0-1.0.2q-r0 libssl1.0 libssl1.0-1.0.2q-r0 expat expat-2.2.5-r0 gdbm gdbm-1.13-r1 -sqlite-libs sqlite-libs-3.24.0-r0 +sqlite-libs sqlite-libs-3.25.3-r0 python2 python2-2.7.15-r1 nghttp2-libs nghttp2-libs-1.32.0-r0 libssh2 libssh2-1.8.0-r3 From cd31389648c428a50041ba8ce6db3bc402e1a118 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Jan 2019 01:44:51 +0000 Subject: [PATCH 021/525] Bot Updating Templated Files --- Jenkinsfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index daa8c08..76b37f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,7 +123,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() } } @@ -344,20 +344,25 @@ pipeline { chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ + apt list -qq --installed > /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi - if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then + NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) + echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" + if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt - git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' - git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + wait + git add package_versions.txt + git commit -m 'Bot Updating Package Versions' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag updated, stopping build process" else echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag is same as previous continue with build process" fi rm -Rf ${TEMPDIR}''' script{ From 2883a12e2b55aa27b75f6d27b2775cf8585c4101 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Jan 2019 04:35:44 +0000 Subject: [PATCH 022/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 216707c..6f5f771 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libpng libpng-1.6.34-r1 freetype freetype-2.9.1-r1 libgcc libgcc-6.4.0-r9 libstdc++ libstdc++-6.4.0-r9 -libjpeg-turbo libjpeg-turbo-1.5.3-r3 +libjpeg-turbo libjpeg-turbo-1.5.3-r4 tiff tiff-4.0.10-r0 lcms2 lcms2-2.9-r1 libffi libffi-3.2.1-r4 @@ -62,7 +62,7 @@ unrar unrar-5.6.4-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 vnstat vnstat-1.18-r0 -wget wget-1.19.5-r0 +wget wget-1.20.1-r0 py-greenlet py-greenlet-0.4.13-r0 py-gevent py-gevent-1.2.2-r0 py2-greenlet py2-greenlet-0.4.13-r0 From 8d9b6f886d0b6c76269addc4338f42ff0b5d1d46 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Jan 2019 16:29:52 +0000 Subject: [PATCH 023/525] Bot Updating Templated Files --- Jenkinsfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 76b37f2..79cac5e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,14 +84,10 @@ pipeline { script{ env.PACKAGE_TAG = sh( script: '''#!/bin/bash - http_code=$(curl --write-out %{http_code} -s -o /dev/null \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt) - if [[ "${http_code}" -ne 200 ]] ; then - echo none + if [ -e package_versions.txt ] ; then + cat package_versions.txt | md5sum | cut -c1-8 else - curl -s \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt \ - | md5sum | cut -c1-8 + echo none fi''', returnStdout: true).trim() } From 4dbf4137a0a8b59cfeddf9d4ec02f441a1a374ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Jan 2019 04:31:36 +0000 Subject: [PATCH 024/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6f5f771..b02768d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.2-r0 py-setuptools py-setuptools-39.1.0-r0 py2-pip py2-pip-10.0.1-r0 -tar tar-1.30-r0 +tar tar-1.31-r0 unrar unrar-5.6.4-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From ca37b63701cc78985bdd9fb5b18170954875337f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Feb 2019 03:59:40 +0000 Subject: [PATCH 025/525] Bot Updating Templated Files --- Jenkinsfile | 9 +++++++++ README.md | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 79cac5e..5c7b137 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -211,6 +211,15 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi + mkdir -p ${TEMPDIR}/gitbook + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation + if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then + cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + cd ${TEMPDIR}/gitbook/docker-documentation/ + git add images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( diff --git a/README.md b/README.md index 81a9e9a..cd96fca 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain [![](https://images.microbadger.com/badges/image/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg) ![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg) +[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-bazarr/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) +[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. @@ -35,6 +37,8 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). +Simply pulling `linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. + The architectures supported by this image are: | Architecture | Tag | @@ -43,6 +47,7 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v6-latest | + ## Usage Here are some example snippets to help you get started creating a container. @@ -121,6 +126,7 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) ``` +   ## Application Setup @@ -138,6 +144,25 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel * image version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/bazarr` +## Updating Info + +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + +### Via Docker Run/Create +* Update the image: `docker pull linuxserver/bazarr` +* Stop the running container: `docker stop bazarr` +* Delete the container: `docker rm bazarr` +* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* Start the new container: `docker start bazarr` +* You can also remove the old dangling images: `docker image prune` + +### Via Docker Compose +* Update the image: `docker-compose pull linuxserver/bazarr` +* Let compose update containers as necessary: `docker-compose up -d` +* You can also remove the old dangling images: `docker image prune` + ## Versions * **11.09.18:** - Initial release. From 7ff62303042fe5e334bc3fe97ca4223341dd4a51 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 22 Feb 2019 17:23:16 -0800 Subject: [PATCH 026/525] Rebasing to Alpine 3.9 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index adebb01..1efcf56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.python:3.8 +FROM lsiobase/alpine.python:3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ff5b33e..2da93f9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.python.arm64:3.8 +FROM lsiobase/alpine.python.arm64:3.9 # Add qemu to build on x86_64 systems COPY qemu-aarch64-static /usr/bin diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4999ef1..538c062 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.python.armhf:3.8 +FROM lsiobase/alpine.python.armhf:3.9 # Add qemu to build on x86_64 systems COPY qemu-arm-static /usr/bin diff --git a/readme-vars.yml b/readme-vars.yml index 2f7c69a..55f7abe 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,4 +44,5 @@ app_setup_block: | # changelog changelogs: + - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "11.09.18:", desc: "Initial release." } From 11b3aaee3d57ac775f434ca654e292d6f9ba607b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 23 Feb 2019 19:04:13 +0000 Subject: [PATCH 027/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b02768d..d4e8fd0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,9 +2,9 @@ musl musl-1.1.19-r10 busybox busybox-1.28.4-r3 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 -libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 -libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 +libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 +libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 +libressl2.7-libtls libressl2.7-libtls-2.7.5-r0 ssl_client ssl_client-1.28.4-r3 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 From b4ed9dc433d96c472e9f8011edc405f622cdba92 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 04:49:19 +0000 Subject: [PATCH 028/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd96fca..569a89e 100644 --- a/README.md +++ b/README.md @@ -165,4 +165,5 @@ Below are the instructions for updating containers: ## Versions +* **22.02.19:** - Rebasing to alpine 3.9. * **11.09.18:** - Initial release. From f32f65bcb741e45f4b9221793130b8eb6ea526c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 04:56:15 +0000 Subject: [PATCH 029/525] Bot Updating Package Versions --- package_versions.txt | 91 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d4e8fd0..1f19f29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,69 +1,68 @@ -musl musl-1.1.19-r10 -busybox busybox-1.28.4-r3 -alpine-baselayout alpine-baselayout-3.1.0-r0 +musl musl-1.1.20-r3 +busybox busybox-1.29.3-r10 +alpine-baselayout alpine-baselayout-3.1.0-r3 alpine-keys alpine-keys-2.1-r1 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 -libressl2.7-libtls libressl2.7-libtls-2.7.5-r0 -ssl_client ssl_client-1.28.4-r3 +libcrypto1.1 libcrypto1.1-1.1.1a-r1 +libssl1.1 libssl1.1-1.1.1a-r1 +ca-certificates-cacert ca-certificates-cacert-20190108-r0 +libtls-standalone libtls-standalone-2.7.4-r6 +ssl_client ssl_client-1.29.3-r10 zlib zlib-1.2.11-r1 -apk-tools apk-tools-2.10.1-r0 +apk-tools apk-tools-2.10.3-r1 scanelf scanelf-1.2.3-r0 -musl-utils musl-utils-1.1.19-r10 +musl-utils musl-utils-1.1.20-r3 libc-utils libc-utils-0.7.1-r0 xz-libs xz-libs-5.2.4-r0 xz xz-5.2.4-r0 -ca-certificates ca-certificates-20171114-r3 -ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1 -ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1 -ncurses-libs ncurses-libs-6.1_p20180818-r1 -readline readline-7.0.003-r0 +ca-certificates ca-certificates-20190108-r0 +ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0 +ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0 +ncurses-libs ncurses-libs-6.1_p20190105-r0 +readline readline-7.0.003-r1 bash bash-4.4.19-r1 libattr libattr-2.4.47-r7 libacl libacl-2.2.52-r5 -coreutils coreutils-8.29-r2 +coreutils coreutils-8.30-r0 linux-pam linux-pam-1.3.0-r0 shadow shadow-4.5-r0 -tzdata tzdata-2018f-r0 +tzdata tzdata-2018i-r0 libbz2 libbz2-1.0.6-r6 -libpng libpng-1.6.34-r1 -freetype freetype-2.9.1-r1 -libgcc libgcc-6.4.0-r9 -libstdc++ libstdc++-6.4.0-r9 +libpng libpng-1.6.35-r0 +freetype freetype-2.9.1-r2 +libgcc libgcc-8.2.0-r2 +libstdc++ libstdc++-8.2.0-r2 libjpeg-turbo libjpeg-turbo-1.5.3-r4 tiff tiff-4.0.10-r0 lcms2 lcms2-2.9-r1 -libffi libffi-3.2.1-r4 -libwebp libwebp-1.0.0-r0 -openjpeg openjpeg-2.3.0-r1 -libcrypto1.0 libcrypto1.0-1.0.2q-r0 -libssl1.0 libssl1.0-1.0.2q-r0 -expat expat-2.2.5-r0 +libffi libffi-3.2.1-r6 +libwebp libwebp-1.0.1-r0 +openjpeg openjpeg-2.3.0-r2 +expat expat-2.2.6-r0 gdbm gdbm-1.13-r1 -sqlite-libs sqlite-libs-3.25.3-r0 -python2 python2-2.7.15-r1 -nghttp2-libs nghttp2-libs-1.32.0-r0 -libssh2 libssh2-1.8.0-r3 -libcurl libcurl-7.61.1-r1 -curl curl-7.61.1-r1 -pcre2 pcre2-10.31-r0 -git git-2.18.1-r0 -openssl openssl-1.0.2q-r0 +sqlite-libs sqlite-libs-3.26.0-r3 +python2 python2-2.7.15-r3 +nghttp2-libs nghttp2-libs-1.35.1-r0 +libssh2 libssh2-1.8.0-r4 +libcurl libcurl-7.63.0-r0 +curl curl-7.63.0-r0 +pcre2 pcre2-10.32-r1 +git git-2.20.1-r0 +openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 -libgpg-error libgpg-error-1.30-r0 -libgcrypt libgcrypt-1.8.3-r0 -libxml2 libxml2-2.9.8-r1 +libgpg-error libgpg-error-1.33-r0 +libgcrypt libgcrypt-1.8.4-r0 +libxml2 libxml2-2.9.9-r0 libxslt libxslt-1.1.32-r0 -py2-lxml py2-lxml-4.2.2-r0 -py-setuptools py-setuptools-39.1.0-r0 -py2-pip py2-pip-10.0.1-r0 +py2-lxml py2-lxml-4.2.5-r0 +py-setuptools py-setuptools-40.6.3-r0 +py2-pip py2-pip-18.1-r0 tar tar-1.31-r0 -unrar unrar-5.6.4-r0 +unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 vnstat vnstat-1.18-r0 wget wget-1.20.1-r0 -py-greenlet py-greenlet-0.4.13-r0 -py-gevent py-gevent-1.2.2-r0 -py2-greenlet py2-greenlet-0.4.13-r0 -py2-gevent py2-gevent-1.2.2-r0 +py-greenlet py-greenlet-0.4.15-r0 +py-gevent py-gevent-1.3.4-r0 +py2-greenlet py2-greenlet-0.4.15-r0 +py2-gevent py2-gevent-1.3.4-r0 From 1ab37571bf41f12e5b82d101158ca46d44cadf22 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 25 Feb 2019 04:59:48 +0000 Subject: [PATCH 030/525] Bot Updating Templated Files --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 569a89e..d66c944 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,6 @@ Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). -# PSA: Changes are happening - -From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag. - -TLDR: Multi-arch support is changing from multiple repos to one repo per container image. - # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") @@ -35,7 +29,7 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. From bb732642bbf05d0da3cb975447a17ffb76979152 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 2 Mar 2019 20:52:35 +0000 Subject: [PATCH 031/525] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++++++++- README.md | 32 +++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5c7b137..74a4c11 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( - script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', + script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', returnStdout: true).trim() env.GITHUB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', @@ -294,6 +294,9 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''docker rmi \ + ${IMAGE}:arm32v6-${META_TAG} \ + lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -320,6 +323,9 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -481,6 +487,10 @@ pipeline { sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" sh "docker push ${IMAGE}:development" sh "docker push ${IMAGE}:${META_TAG}" + sh '''docker rmi \ + ${IMAGE}:${META_TAG} \ + ${IMAGE}:development ''' + } } } @@ -528,6 +538,15 @@ pipeline { sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:development" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" + sh '''docker rmi \ + ${IMAGE}:amd64-${META_TAG} \ + ${IMAGE}:amd64-development \ + ${IMAGE}:arm32v6-${META_TAG} \ + ${IMAGE}:arm32v6-development \ + ${IMAGE}:arm64v8-${META_TAG} \ + ${IMAGE}:arm64v8-development \ + lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -588,6 +607,18 @@ pipeline { } } } + // If this is a Pull request send the CI link as a comment on it + stage('Pull Request Comment') { + when { + not {environment name: 'CHANGE_ID', value: ''} + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ + -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' ''' + } + } } /* ###################### Send status to Discord diff --git a/README.md b/README.md index d66c944..5cdb6ce 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ Here are some example snippets to help you get started creating a container. ``` docker create \ --name=bazarr \ - -e PUID=1001 \ - -e PGID=1001 \ + -e PUID=1000 \ + -e PGID=1000 \ -e TZ=Europe/London \ -p 6767:6767 \ -v :/config \ @@ -80,8 +80,8 @@ services: image: linuxserver/bazarr container_name: bazarr environment: - - PUID=1001 - - PGID=1001 + - PUID=1000 + - PGID=1000 - TZ=Europe/London volumes: - :/config @@ -89,7 +89,6 @@ services: - Date: Sun, 3 Mar 2019 21:04:58 +0000 Subject: [PATCH 032/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f19f29..7a49b3a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,20 +43,20 @@ sqlite-libs sqlite-libs-3.26.0-r3 python2 python2-2.7.15-r3 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.63.0-r0 -curl curl-7.63.0-r0 +libcurl libcurl-7.64.0-r1 +curl curl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r0 +libxml2 libxml2-2.9.9-r1 libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.5-r0 py-setuptools py-setuptools-40.6.3-r0 py2-pip py2-pip-18.1-r0 -tar tar-1.31-r0 +tar tar-1.32-r0 unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From 5ff46ba474b6ecbde4ba8df2c585b64e8718b21b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Mar 2019 16:13:57 -0500 Subject: [PATCH 033/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a49b3a..1f19f29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,20 +43,20 @@ sqlite-libs sqlite-libs-3.26.0-r3 python2 python2-2.7.15-r3 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.64.0-r1 -curl curl-7.64.0-r1 +libcurl libcurl-7.63.0-r0 +curl curl-7.63.0-r0 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r1 +libxml2 libxml2-2.9.9-r0 libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.5-r0 py-setuptools py-setuptools-40.6.3-r0 py2-pip py2-pip-18.1-r0 -tar tar-1.32-r0 +tar tar-1.31-r0 unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From 3dea8241b7b33988a89a17249b5c55ea4b9858d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Mar 2019 21:17:43 +0000 Subject: [PATCH 034/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f19f29..7a49b3a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,20 +43,20 @@ sqlite-libs sqlite-libs-3.26.0-r3 python2 python2-2.7.15-r3 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.63.0-r0 -curl curl-7.63.0-r0 +libcurl libcurl-7.64.0-r1 +curl curl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r0 +libxml2 libxml2-2.9.9-r1 libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.5-r0 py-setuptools py-setuptools-40.6.3-r0 py2-pip py2-pip-18.1-r0 -tar tar-1.31-r0 +tar tar-1.32-r0 unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From d301cd4f75d7ddc79cd5b12c4f4528dc728e63c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 Mar 2019 13:01:45 -0500 Subject: [PATCH 035/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a49b3a..1f19f29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,20 +43,20 @@ sqlite-libs sqlite-libs-3.26.0-r3 python2 python2-2.7.15-r3 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.64.0-r1 -curl curl-7.64.0-r1 +libcurl libcurl-7.63.0-r0 +curl curl-7.63.0-r0 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r1 +libxml2 libxml2-2.9.9-r0 libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.5-r0 py-setuptools py-setuptools-40.6.3-r0 py2-pip py2-pip-18.1-r0 -tar tar-1.32-r0 +tar tar-1.31-r0 unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From 08b12f7021be60c822cf7ceaa56f2f0ceb55d05b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 Mar 2019 18:06:11 +0000 Subject: [PATCH 036/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f19f29..7a49b3a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,20 +43,20 @@ sqlite-libs sqlite-libs-3.26.0-r3 python2 python2-2.7.15-r3 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.63.0-r0 -curl curl-7.63.0-r0 +libcurl libcurl-7.64.0-r1 +curl curl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 openssl openssl-1.1.1a-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r0 +libxml2 libxml2-2.9.9-r1 libxslt libxslt-1.1.32-r0 py2-lxml py2-lxml-4.2.5-r0 py-setuptools py-setuptools-40.6.3-r0 py2-pip py2-pip-18.1-r0 -tar tar-1.31-r0 +tar tar-1.32-r0 unrar unrar-5.6.8-r0 unzip unzip-6.0-r4 libgd libgd-2.2.5-r1 From 83b745861664989e7564291d557a6b312180dcae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Mar 2019 20:52:34 +0000 Subject: [PATCH 037/525] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74a4c11..2e06d12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -355,7 +355,7 @@ pipeline { chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed > /tmp/package_versions.txt && \ + apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) From b576b0735c3c9f3bf6e8ff31a82f9d476b3fa394 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 16 Mar 2019 16:04:06 -0400 Subject: [PATCH 038/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a49b3a..226b47e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,8 +2,8 @@ musl musl-1.1.20-r3 busybox busybox-1.29.3-r10 alpine-baselayout alpine-baselayout-3.1.0-r3 alpine-keys alpine-keys-2.1-r1 -libcrypto1.1 libcrypto1.1-1.1.1a-r1 -libssl1.1 libssl1.1-1.1.1a-r1 +libcrypto1.1 libcrypto1.1-1.1.1b-r1 +libssl1.1 libssl1.1-1.1.1b-r1 ca-certificates-cacert ca-certificates-cacert-20190108-r0 libtls-standalone libtls-standalone-2.7.4-r6 ssl_client ssl_client-1.29.3-r10 @@ -36,7 +36,7 @@ tiff tiff-4.0.10-r0 lcms2 lcms2-2.9-r1 libffi libffi-3.2.1-r6 libwebp libwebp-1.0.1-r0 -openjpeg openjpeg-2.3.0-r2 +openjpeg openjpeg-2.3.0-r3 expat expat-2.2.6-r0 gdbm gdbm-1.13-r1 sqlite-libs sqlite-libs-3.26.0-r3 @@ -47,7 +47,7 @@ libcurl libcurl-7.64.0-r1 curl curl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 -openssl openssl-1.1.1a-r1 +openssl openssl-1.1.1b-r1 p7zip p7zip-16.02-r3 libgpg-error libgpg-error-1.33-r0 libgcrypt libgcrypt-1.8.4-r0 From 31b4cd259fd77f5be6086dedfb3fc1de671c5fd5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Mar 2019 16:17:28 -0700 Subject: [PATCH 039/525] Switching to new Base images, shift to arm32v7 tag. --- Dockerfile | 2 +- Dockerfile.aarch64 | 5 +-- Dockerfile.armhf | 5 +-- Jenkinsfile | 93 ++++++++++++++++++++++++++++++---------------- README.md | 4 +- readme-vars.yml | 3 +- 6 files changed, 68 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1efcf56..d3f2b5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.python:3.9 +FROM lsiobase/python:3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2da93f9..f312902 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,7 +1,4 @@ -FROM lsiobase/alpine.python.arm64:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-aarch64-static /usr/bin +FROM lsiobase/python:arm64v8-3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 538c062..f700d7a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,7 +1,4 @@ -FROM lsiobase/alpine.python.armhf:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-arm-static /usr/bin +FROM lsiobase/python:arm32v7-3.9 # set version label ARG BUILD_DATE diff --git a/Jenkinsfile b/Jenkinsfile index 2e06d12..d4af35a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -134,7 +134,7 @@ pipeline { script{ env.IMAGE = env.DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -152,7 +152,7 @@ pipeline { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -170,7 +170,7 @@ pipeline { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } @@ -180,6 +180,35 @@ pipeline { } } } + // Run ShellCheck + stage('ShellCheck') { + when { + environment name: 'CI', value: 'true' + } + steps { + withCredentials([ + string(credentialsId: 'spaces-key', variable: 'DO_KEY'), + string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + ]) { + script{ + env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + } + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''#! /bin/bash + set -e + docker pull lsiodev/spaces-file-upload:latest + docker run --rm \ + -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ + -e FILE_NAME="shellcheck-result.xml" \ + -e MIMETYPE="text/xml" \ + -v ${WORKSPACE}:/mnt \ + -e SECRET_KEY=\"${DO_SECRET}\" \ + -e ACCESS_KEY=\"${DO_KEY}\" \ + -t lsiodev/spaces-file-upload:latest \ + python /upload.py''' + } + } + } // Use helper containers to render templated files stage('Update-Templates') { when { @@ -254,7 +283,7 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ + sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -267,7 +296,7 @@ pipeline { parallel { stage('Build X86') { steps { - sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ + sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -290,13 +319,13 @@ pipeline { ''' sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ + sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh '''docker rmi \ - ${IMAGE}:arm32v6-${META_TAG} \ - lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ''' + ${IMAGE}:arm32v7-${META_TAG} \ + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -319,7 +348,7 @@ pipeline { ''' sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" sh "chmod +x qemu-*" - sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -349,13 +378,13 @@ pipeline { fi if [ "${DIST_IMAGE}" == "alpine" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info > packages && \ - apk info -v > versions && \ - paste -d " " packages versions > /tmp/package_versions.txt && \ + apk info -v > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \ + apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) @@ -435,9 +464,9 @@ pipeline { set -e docker pull lsiodev/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} + docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -514,38 +543,38 @@ pipeline { ''' sh '''#! /bin/bash if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} + docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi''' sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-development" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-development" sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development" sh "docker push ${IMAGE}:amd64-${META_TAG}" - sh "docker push ${IMAGE}:arm32v6-${META_TAG}" + sh "docker push ${IMAGE}:arm32v7-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}" sh "docker push ${IMAGE}:amd64-development" - sh "docker push ${IMAGE}:arm32v6-development" + sh "docker push ${IMAGE}:arm32v7-development" sh "docker push ${IMAGE}:arm64v8-development" sh "docker manifest push --purge ${IMAGE}:development || :" - sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v6-development ${IMAGE}:arm64v8-development" - sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v6-development --os linux --arch arm" + sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v7-development ${IMAGE}:arm64v8-development" + sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v7-development --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" - sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm" + sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" + sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:development" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:amd64-${META_TAG} \ ${IMAGE}:amd64-development \ - ${IMAGE}:arm32v6-${META_TAG} \ - ${IMAGE}:arm32v6-development \ + ${IMAGE}:arm32v7-${META_TAG} \ + ${IMAGE}:arm32v7-development \ ${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-development \ - lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } @@ -616,7 +645,7 @@ pipeline { } steps { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' ''' + -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' } } } @@ -631,12 +660,12 @@ pipeline { } else if (currentBuild.currentResult == "SUCCESS"){ sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + "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 --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + "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 5cdb6ce..455b08a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) @@ -39,7 +38,7 @@ The architectures supported by this image are: | :----: | --- | | x86-64 | amd64-latest | | arm64 | arm64v8-latest | -| armhf | arm32v6-latest | +| armhf | arm32v7-latest | ## Usage @@ -169,5 +168,6 @@ Below are the instructions for updating containers: ## Versions +* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **22.02.19:** - Rebasing to alpine 3.9. * **11.09.18:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 55f7abe..81be3b2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -11,7 +11,7 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} + - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # Optional Block optional_block_1: true @@ -44,5 +44,6 @@ app_setup_block: | # changelog changelogs: + - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "11.09.18:", desc: "Initial release." } From e70cf5e89da315161c62cad394f4b242dd24ec9e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Mar 2019 19:39:13 +0000 Subject: [PATCH 040/525] Bot Updating Package Versions --- package_versions.txt | 136 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 226b47e..461c5f3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,68 +1,68 @@ -musl musl-1.1.20-r3 -busybox busybox-1.29.3-r10 -alpine-baselayout alpine-baselayout-3.1.0-r3 -alpine-keys alpine-keys-2.1-r1 -libcrypto1.1 libcrypto1.1-1.1.1b-r1 -libssl1.1 libssl1.1-1.1.1b-r1 -ca-certificates-cacert ca-certificates-cacert-20190108-r0 -libtls-standalone libtls-standalone-2.7.4-r6 -ssl_client ssl_client-1.29.3-r10 -zlib zlib-1.2.11-r1 -apk-tools apk-tools-2.10.3-r1 -scanelf scanelf-1.2.3-r0 -musl-utils musl-utils-1.1.20-r3 -libc-utils libc-utils-0.7.1-r0 -xz-libs xz-libs-5.2.4-r0 -xz xz-5.2.4-r0 -ca-certificates ca-certificates-20190108-r0 -ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0 -ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0 -ncurses-libs ncurses-libs-6.1_p20190105-r0 -readline readline-7.0.003-r1 -bash bash-4.4.19-r1 -libattr libattr-2.4.47-r7 -libacl libacl-2.2.52-r5 -coreutils coreutils-8.30-r0 -linux-pam linux-pam-1.3.0-r0 -shadow shadow-4.5-r0 -tzdata tzdata-2018i-r0 -libbz2 libbz2-1.0.6-r6 -libpng libpng-1.6.35-r0 -freetype freetype-2.9.1-r2 -libgcc libgcc-8.2.0-r2 -libstdc++ libstdc++-8.2.0-r2 -libjpeg-turbo libjpeg-turbo-1.5.3-r4 -tiff tiff-4.0.10-r0 -lcms2 lcms2-2.9-r1 -libffi libffi-3.2.1-r6 -libwebp libwebp-1.0.1-r0 -openjpeg openjpeg-2.3.0-r3 -expat expat-2.2.6-r0 -gdbm gdbm-1.13-r1 -sqlite-libs sqlite-libs-3.26.0-r3 -python2 python2-2.7.15-r3 -nghttp2-libs nghttp2-libs-1.35.1-r0 -libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.64.0-r1 -curl curl-7.64.0-r1 -pcre2 pcre2-10.32-r1 -git git-2.20.1-r0 -openssl openssl-1.1.1b-r1 -p7zip p7zip-16.02-r3 -libgpg-error libgpg-error-1.33-r0 -libgcrypt libgcrypt-1.8.4-r0 -libxml2 libxml2-2.9.9-r1 -libxslt libxslt-1.1.32-r0 -py2-lxml py2-lxml-4.2.5-r0 -py-setuptools py-setuptools-40.6.3-r0 -py2-pip py2-pip-18.1-r0 -tar tar-1.32-r0 -unrar unrar-5.6.8-r0 -unzip unzip-6.0-r4 -libgd libgd-2.2.5-r1 -vnstat vnstat-1.18-r0 -wget wget-1.20.1-r0 -py-greenlet py-greenlet-0.4.15-r0 -py-gevent py-gevent-1.3.4-r0 -py2-greenlet py2-greenlet-0.4.15-r0 -py2-gevent py2-gevent-1.3.4-r0 +alpine-baselayout-3.1.0-r3 +alpine-keys-2.1-r1 +apk-tools-2.10.3-r1 +bash-4.4.19-r1 +busybox-1.29.3-r10 +ca-certificates-20190108-r0 +ca-certificates-cacert-20190108-r0 +coreutils-8.30-r0 +curl-7.64.0-r1 +expat-2.2.6-r0 +freetype-2.9.1-r2 +gdbm-1.13-r1 +git-2.20.1-r0 +lcms2-2.9-r1 +libacl-2.2.52-r5 +libattr-2.4.47-r7 +libbz2-1.0.6-r6 +libc-utils-0.7.1-r0 +libcrypto1.1-1.1.1b-r1 +libcurl-7.64.0-r1 +libffi-3.2.1-r6 +libgcc-8.2.0-r2 +libgcrypt-1.8.4-r0 +libgd-2.2.5-r1 +libgpg-error-1.33-r0 +libjpeg-turbo-1.5.3-r4 +libpng-1.6.35-r0 +libssh2-1.8.1-r0 +libssl1.1-1.1.1b-r1 +libstdc++-8.2.0-r2 +libtls-standalone-2.7.4-r6 +libwebp-1.0.1-r0 +libxml2-2.9.9-r1 +libxslt-1.1.32-r0 +linux-pam-1.3.0-r0 +musl-1.1.20-r4 +musl-utils-1.1.20-r4 +ncurses-libs-6.1_p20190105-r0 +ncurses-terminfo-6.1_p20190105-r0 +ncurses-terminfo-base-6.1_p20190105-r0 +nghttp2-libs-1.35.1-r0 +openjpeg-2.3.0-r3 +openssl-1.1.1b-r1 +p7zip-16.02-r3 +pcre2-10.32-r1 +py-gevent-1.3.4-r0 +py-greenlet-0.4.15-r0 +py-setuptools-40.6.3-r0 +py2-gevent-1.3.4-r0 +py2-greenlet-0.4.15-r0 +py2-lxml-4.2.5-r0 +py2-pip-18.1-r0 +python2-2.7.15-r3 +readline-7.0.003-r1 +scanelf-1.2.3-r0 +shadow-4.5-r0 +sqlite-libs-3.26.0-r3 +ssl_client-1.29.3-r10 +tar-1.32-r0 +tiff-4.0.10-r0 +tzdata-2018i-r0 +unrar-5.6.8-r0 +unzip-6.0-r4 +vnstat-1.18-r0 +wget-1.20.1-r0 +xz-5.2.4-r0 +xz-libs-5.2.4-r0 +zlib-1.2.11-r1 From f9d4a849a1e57f9c146cefa91d0808ab8c616f74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Apr 2019 07:03:36 -0400 Subject: [PATCH 041/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 461c5f3..4eb13ea 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -25,7 +25,7 @@ libgd-2.2.5-r1 libgpg-error-1.33-r0 libjpeg-turbo-1.5.3-r4 libpng-1.6.35-r0 -libssh2-1.8.1-r0 +libssh2-1.8.2-r0 libssl1.1-1.1.1b-r1 libstdc++-8.2.0-r2 libtls-standalone-2.7.4-r6 From e6fa3f571485bcdd2f3ba977f5077d5e362ba348 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Apr 2019 14:01:53 -0400 Subject: [PATCH 042/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4eb13ea..fdd758f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ libcurl-7.64.0-r1 libffi-3.2.1-r6 libgcc-8.2.0-r2 libgcrypt-1.8.4-r0 -libgd-2.2.5-r1 +libgd-2.2.5-r3 libgpg-error-1.33-r0 libjpeg-turbo-1.5.3-r4 libpng-1.6.35-r0 @@ -62,7 +62,7 @@ tzdata-2018i-r0 unrar-5.6.8-r0 unzip-6.0-r4 vnstat-1.18-r0 -wget-1.20.1-r0 +wget-1.20.3-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 zlib-1.2.11-r1 From 1405c63311421eddb5a7c168137f91d157743bfb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Apr 2019 00:02:29 -0400 Subject: [PATCH 043/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fdd758f..ef4a317 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,7 +19,7 @@ libc-utils-0.7.1-r0 libcrypto1.1-1.1.1b-r1 libcurl-7.64.0-r1 libffi-3.2.1-r6 -libgcc-8.2.0-r2 +libgcc-8.3.0-r0 libgcrypt-1.8.4-r0 libgd-2.2.5-r3 libgpg-error-1.33-r0 @@ -27,7 +27,7 @@ libjpeg-turbo-1.5.3-r4 libpng-1.6.35-r0 libssh2-1.8.2-r0 libssl1.1-1.1.1b-r1 -libstdc++-8.2.0-r2 +libstdc++-8.3.0-r0 libtls-standalone-2.7.4-r6 libwebp-1.0.1-r0 libxml2-2.9.9-r1 From bd641b4fb846979edf391c9fadc58b8af4e69b85 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Apr 2019 03:01:13 +0100 Subject: [PATCH 044/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ef4a317..f0adca4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libstdc++-8.3.0-r0 libtls-standalone-2.7.4-r6 libwebp-1.0.1-r0 libxml2-2.9.9-r1 -libxslt-1.1.32-r0 +libxslt-1.1.33-r1 linux-pam-1.3.0-r0 musl-1.1.20-r4 musl-utils-1.1.20-r4 @@ -58,7 +58,7 @@ sqlite-libs-3.26.0-r3 ssl_client-1.29.3-r10 tar-1.32-r0 tiff-4.0.10-r0 -tzdata-2018i-r0 +tzdata-2019a-r0 unrar-5.6.8-r0 unzip-6.0-r4 vnstat-1.18-r0 From 86d9851371218940b376e7971ebb03d6bb3d3b14 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 May 2019 07:00:02 -0400 Subject: [PATCH 045/525] Bot Updating Templated Files --- Jenkinsfile | 28 ++++++++++++---------------- README.md | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4af35a..49b7393 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', + script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -242,7 +242,7 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then + if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md @@ -317,15 +317,13 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" - sh "chmod +x qemu-*" sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" sh '''docker rmi \ ${IMAGE}:arm32v7-${META_TAG} \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ''' + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -346,15 +344,13 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" - sh "chmod +x qemu-*" sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" sh '''docker rmi \ ${IMAGE}:arm64v8-${META_TAG} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -518,7 +514,7 @@ pipeline { sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:development ''' + ${IMAGE}:development || :''' } } @@ -575,7 +571,7 @@ pipeline { ${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-development \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -584,25 +580,25 @@ pipeline { when { branch "development" expression { - env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER + env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to development",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "development",\ - "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done diff --git a/README.md b/README.md index 455b08a..55ef03e 100644 --- a/README.md +++ b/README.md @@ -150,15 +150,6 @@ Below are the instructions for updating containers: * Start the new container: `docker start bazarr` * You can also remove the old dangling images: `docker image prune` -### Via Taisun auto-updater (especially useful if you don't remember the original parameters) -* Pull the latest image at its tag and replace it with the same env variables in one shot: - ``` - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock taisun/updater \ - --oneshot bazarr - ``` -* You can also remove the old dangling images: `docker image prune` - ### Via Docker Compose * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull bazarr` @@ -166,6 +157,35 @@ Below are the instructions for updating containers: * or update a single container: `docker-compose up -d bazarr` * You can also remove the old dangling images: `docker image prune` +### Via Watchtower auto-updater (especially useful if you don't remember the original parameters) +* Pull the latest image at its tag and replace it with the same env variables in one run: + ``` + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + containrrr/watchtower \ + --run-once bazarr + ``` +* You can also remove the old dangling images: `docker image prune` + +## Building locally + +If you want to make local modifications to these images for development purposes or just to customize the logic: +``` +git clone https://github.com/linuxserver/docker-bazarr.git +cd docker-bazarr +docker build \ + --no-cache \ + --pull \ + -t linuxserver/bazarr:latest . +``` + +The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +``` +docker run --rm --privileged multiarch/qemu-user-static:register --reset +``` + +Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. + ## Versions * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. From 04384e9f17f3500e6f87c6e83b4751b88a6a82f6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 7 May 2019 07:06:08 -0400 Subject: [PATCH 046/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f0adca4..06377fe 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ libgcrypt-1.8.4-r0 libgd-2.2.5-r3 libgpg-error-1.33-r0 libjpeg-turbo-1.5.3-r4 -libpng-1.6.35-r0 +libpng-1.6.37-r0 libssh2-1.8.2-r0 libssl1.1-1.1.1b-r1 libstdc++-8.3.0-r0 From e1d96a5c5474462f146b2a205dfab34ac198fbb0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 11 May 2019 20:00:06 +0000 Subject: [PATCH 047/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 06377fe..99d2c50 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,10 +50,10 @@ py2-gevent-1.3.4-r0 py2-greenlet-0.4.15-r0 py2-lxml-4.2.5-r0 py2-pip-18.1-r0 -python2-2.7.15-r3 +python2-2.7.16-r1 readline-7.0.003-r1 scanelf-1.2.3-r0 -shadow-4.5-r0 +shadow-4.5-r1 sqlite-libs-3.26.0-r3 ssl_client-1.29.3-r10 tar-1.32-r0 From d1d915fa4803f67aeab187563e5a0a2e774def18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 May 2019 13:00:16 -0400 Subject: [PATCH 048/525] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49b7393..db8a190 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,6 +54,14 @@ 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.LICENSE_TAG = sh( + script: '''#!/bin/bash + if [ -e LICENSE ] ; then + cat LICENSE | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() } script{ env.LS_RELEASE_NUMBER = sh( @@ -226,14 +234,17 @@ pipeline { docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest - if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then + if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ + [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ + [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} From 0830d99e5b1b6f236ad53c6d83d37607d0a74acc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 May 2019 13:01:46 -0400 Subject: [PATCH 049/525] Bot Updating Templated Files --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100755 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 8402ece47e5a2e7c02322886f5dbf0dbe68545eb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Jun 2019 03:00:08 +0200 Subject: [PATCH 050/525] Bot Updating Templated Files --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index db8a190..5f3b493 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -477,6 +477,7 @@ pipeline { docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ + --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ -e DELAY_START=\"${CI_DELAY}\" \ From 837ad8d73c9d891728aca13e7aa24375df48d53b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Jun 2019 02:05:57 +0100 Subject: [PATCH 051/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 99d2c50..c2c3904 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,7 +53,7 @@ py2-pip-18.1-r0 python2-2.7.16-r1 readline-7.0.003-r1 scanelf-1.2.3-r0 -shadow-4.5-r1 +shadow-4.5-r2 sqlite-libs-3.26.0-r3 ssl_client-1.29.3-r10 tar-1.32-r0 From bd3a7e4749ca6b1c23d9eb9296293ad86f629b7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Jun 2019 21:08:15 +0200 Subject: [PATCH 052/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c2c3904..c60dad7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ busybox-1.29.3-r10 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.30-r0 -curl-7.64.0-r1 +curl-7.64.0-r2 expat-2.2.6-r0 freetype-2.9.1-r2 gdbm-1.13-r1 @@ -17,7 +17,7 @@ libattr-2.4.47-r7 libbz2-1.0.6-r6 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1b-r1 -libcurl-7.64.0-r1 +libcurl-7.64.0-r2 libffi-3.2.1-r6 libgcc-8.3.0-r0 libgcrypt-1.8.4-r0 @@ -54,7 +54,7 @@ python2-2.7.16-r1 readline-7.0.003-r1 scanelf-1.2.3-r0 shadow-4.5-r2 -sqlite-libs-3.26.0-r3 +sqlite-libs-3.28.0-r0 ssl_client-1.29.3-r10 tar-1.32-r0 tiff-4.0.10-r0 From c2de3ef6e3b09e55be47467a28547fb1f37ee6dc Mon Sep 17 00:00:00 2001 From: Mateusz Furdyna <17548441+SirFerdek@users.noreply.github.com> Date: Thu, 13 Jun 2019 00:40:57 +0200 Subject: [PATCH 053/525] Fix umask - get umask from environment Makes it consistent with other linuxserver.io images. --- README.md | 4 ++++ readme-vars.yml | 5 +++++ root/etc/services.d/bazarr/run | 3 +++ 3 files changed, 12 insertions(+) diff --git a/README.md b/README.md index 55ef03e..07c787e 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ docker create \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ + -e UMASK_SET=022 `#optional` \ -p 6767:6767 \ -v :/config \ -v :/movies \ @@ -82,6 +83,7 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/London + - UMASK_SET=022 #optional volumes: - :/config - :/movies @@ -101,6 +103,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-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 UMASK_SET=022` | control permissions of files and directories created by Bazarr | | `-v /config` | Bazarr data | | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | @@ -188,6 +191,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.06.19:** - Add env variable for setting umask. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **22.02.19:** - Rebasing to alpine 3.9. * **11.09.18:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 81be3b2..fccb2b5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,6 +35,10 @@ param_ports: param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} +# optional env variables +opt_param_usage_include_env: true +opt_param_env_vars: + - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Bazarr"} # application setup block app_setup_block_enabled: true @@ -44,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "11.09.18:", desc: "Initial release." } diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run index 05ad610..330b669 100644 --- a/root/etc/services.d/bazarr/run +++ b/root/etc/services.d/bazarr/run @@ -1,5 +1,8 @@ #!/usr/bin/with-contenv bash +UMASK_SET=${UMASK_SET:-022} +umask "$UMASK_SET" + exec \ s6-setuidgid abc python /app/bazarr/bazarr.py \ --no-update --config /config From a80abec85005e034c748d70deb3b72cb95723154 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 17 Jun 2019 08:29:59 -0700 Subject: [PATCH 054/525] swap to install deps and using requirements file --- Dockerfile | 28 ++++++++++++++++++++++++++-- Dockerfile.aarch64 | 30 +++++++++++++++++++++++++++--- Dockerfile.armhf | 30 +++++++++++++++++++++++++++--- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/30-config | 1 - 6 files changed, 82 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3f2b5c..30d6fa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/python:3.9 +FROM lsiobase/alpine:3.9 # set version label ARG BUILD_DATE @@ -6,11 +6,27 @@ ARG VERSION ARG BAZARR_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="chbmb" +# hard set UTC in case the user does not define it +ENV TZ="Etc/UTC" RUN \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py2-pip \ + python2-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ - py-gevent && \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python2 \ + unrar \ + unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ @@ -24,7 +40,15 @@ RUN \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + rm -Rf /app/bazarr/bin && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ + /root/.cache \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f312902..ca08f34 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/python:arm64v8-3.9 +FROM lsiobase/alpine:arm64v8-3.9 # set version label ARG BUILD_DATE @@ -6,11 +6,27 @@ ARG VERSION ARG BAZARR_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="chbmb" +# hard set UTC in case the user does not define it +ENV TZ="Etc/UTC" RUN \ -echo "**** install packages ****" && \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py2-pip \ + python2-dev && \ + echo "**** install packages ****" && \ apk add --no-cache \ - py-gevent && \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python2 \ + unrar \ + unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ @@ -24,7 +40,15 @@ echo "**** install packages ****" && \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + rm -Rf /app/bazarr/bin && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ + /root/.cache \ /tmp/* # add local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f700d7a..5f83dfc 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/python:arm32v7-3.9 +FROM lsiobase/alpine:arm32v7-3.9 # set version label ARG BUILD_DATE @@ -6,11 +6,27 @@ ARG VERSION ARG BAZARR_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="chbmb" +# hard set UTC in case the user does not define it +ENV TZ="Etc/UTC" RUN \ -echo "**** install packages ****" && \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py2-pip \ + python2-dev && \ + echo "**** install packages ****" && \ apk add --no-cache \ - py-gevent && \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python2 \ + unrar \ + unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ @@ -24,7 +40,15 @@ echo "**** install packages ****" && \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + rm -Rf /app/bazarr/bin && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ + /root/.cache \ /tmp/* # add local files diff --git a/README.md b/README.md index 07c787e..2dea252 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. * **13.06.19:** - Add env variable for setting umask. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **22.02.19:** - Rebasing to alpine 3.9. diff --git a/readme-vars.yml b/readme-vars.yml index fccb2b5..aab4309 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 39d0c3c..4a919c2 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,5 +2,4 @@ # permissions chown -R abc:abc \ - /app \ /config From e336c56f3b9892e4e9be7a4856498e0b84808c36 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Jun 2019 12:18:52 -0400 Subject: [PATCH 055/525] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c60dad7..609caa9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,6 @@ alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 +alsa-lib-1.1.8-r0 apk-tools-2.10.3-r1 bash-4.4.19-r1 busybox-1.29.3-r10 @@ -8,28 +9,50 @@ ca-certificates-cacert-20190108-r0 coreutils-8.30-r0 curl-7.64.0-r2 expat-2.2.6-r0 +ffmpeg-4.0.2-r0 +ffmpeg-libs-4.0.2-r0 +fontconfig-2.13.1-r0 freetype-2.9.1-r2 +fribidi-1.0.5-r0 gdbm-1.13-r1 -git-2.20.1-r0 -lcms2-2.9-r1 +gmp-6.1.2-r1 +gnutls-3.6.7-r0 +lame-3.100-r0 libacl-2.2.52-r5 +libass-0.14.0-r0 libattr-2.4.47-r7 +libbsd-0.8.6-r2 libbz2-1.0.6-r6 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1b-r1 libcurl-7.64.0-r2 +libdrm-2.4.96-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 libgcrypt-1.8.4-r0 -libgd-2.2.5-r3 libgpg-error-1.33-r0 libjpeg-turbo-1.5.3-r4 +libogg-1.3.3-r2 +libpciaccess-0.14-r0 libpng-1.6.37-r0 libssh2-1.8.2-r0 libssl1.1-1.1.1b-r1 libstdc++-8.3.0-r0 +libtasn1-4.13-r0 +libtheora-1.1.1-r13 libtls-standalone-2.7.4-r6 -libwebp-1.0.1-r0 +libunistring-0.9.10-r0 +libuuid-2.33-r0 +libva-2.2.0-r0 +libvdpau-1.1.1-r2 +libvorbis-1.3.6-r2 +libvpx-1.6.1-r1 +libx11-1.6.7-r0 +libxau-1.0.8-r3 +libxcb-1.13-r2 +libxdmcp-1.1.2-r5 +libxext-1.3.3-r3 +libxfixes-5.0.3-r2 libxml2-2.9.9-r1 libxslt-1.1.33-r1 linux-pam-1.3.0-r0 @@ -38,31 +61,24 @@ musl-utils-1.1.20-r4 ncurses-libs-6.1_p20190105-r0 ncurses-terminfo-6.1_p20190105-r0 ncurses-terminfo-base-6.1_p20190105-r0 +nettle-3.4.1-r0 nghttp2-libs-1.35.1-r0 -openjpeg-2.3.0-r3 -openssl-1.1.1b-r1 -p7zip-16.02-r3 -pcre2-10.32-r1 -py-gevent-1.3.4-r0 -py-greenlet-0.4.15-r0 -py-setuptools-40.6.3-r0 -py2-gevent-1.3.4-r0 -py2-greenlet-0.4.15-r0 -py2-lxml-4.2.5-r0 -py2-pip-18.1-r0 +opus-1.3-r0 +p11-kit-0.23.14-r0 python2-2.7.16-r1 readline-7.0.003-r1 scanelf-1.2.3-r0 +sdl2-2.0.9-r0 shadow-4.5-r2 sqlite-libs-3.28.0-r0 ssl_client-1.29.3-r10 -tar-1.32-r0 -tiff-4.0.10-r0 tzdata-2019a-r0 unrar-5.6.8-r0 unzip-6.0-r4 -vnstat-1.18-r0 -wget-1.20.3-r0 +v4l-utils-libs-1.16.2-r0 +x264-libs-20180304-r1 +x265-libs-2.8-r1 +xvidcore-1.3.4-r1 xz-5.2.4-r0 xz-libs-5.2.4-r0 zlib-1.2.11-r1 From b6ca92807bb518bda4aabe81718f7010d1b04ae1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 17:14:51 -0700 Subject: [PATCH 056/525] Rebasing to Alpine 3.10 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30d6fa1..bed137a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.9 +FROM lsiobase/alpine:3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ca08f34..bfee541 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.9 +FROM lsiobase/alpine:arm64v8-3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5f83dfc..1e10e46 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.9 +FROM lsiobase/alpine:arm32v7-3.10 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index aab4309..1ef0e40 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } From 7d77648babe6bed55542387146f8dacb1ad993e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 20:14:01 +0100 Subject: [PATCH 057/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2dea252..7258438 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **28.06.19:** - Rebasing to alpine 3.10. * **17.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. * **13.06.19:** - Add env variable for setting umask. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. From 3602a53edaa8e8849bc4d2dda0e9b2fe88088e81 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 15:41:25 -0400 Subject: [PATCH 058/525] Bot Updating Package Versions --- package_versions.txt | 108 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 609caa9..02893fc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,83 +1,83 @@ -alpine-baselayout-3.1.0-r3 -alpine-keys-2.1-r1 -alsa-lib-1.1.8-r0 -apk-tools-2.10.3-r1 -bash-4.4.19-r1 -busybox-1.29.3-r10 +alpine-baselayout-3.1.2-r0 +alpine-keys-2.1-r2 +alsa-lib-1.1.9-r0 +apk-tools-2.10.4-r1 +bash-5.0.0-r0 +busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 -coreutils-8.30-r0 -curl-7.64.0-r2 -expat-2.2.6-r0 -ffmpeg-4.0.2-r0 -ffmpeg-libs-4.0.2-r0 +coreutils-8.31-r0 +curl-7.65.1-r0 +expat-2.2.7-r0 +ffmpeg-4.1.3-r1 +ffmpeg-libs-4.1.3-r1 fontconfig-2.13.1-r0 -freetype-2.9.1-r2 -fribidi-1.0.5-r0 +freetype-2.10.0-r0 +fribidi-1.0.5-r1 gdbm-1.13-r1 gmp-6.1.2-r1 -gnutls-3.6.7-r0 +gnutls-3.6.8-r0 lame-3.100-r0 -libacl-2.2.52-r5 +libacl-2.2.52-r6 libass-0.14.0-r0 -libattr-2.4.47-r7 -libbsd-0.8.6-r2 +libattr-2.4.48-r0 +libbsd-0.9.1-r0 libbz2-1.0.6-r6 libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1b-r1 -libcurl-7.64.0-r2 -libdrm-2.4.96-r0 +libcrypto1.1-1.1.1c-r0 +libcurl-7.65.1-r0 +libdrm-2.4.98-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 -libgcrypt-1.8.4-r0 -libgpg-error-1.33-r0 -libjpeg-turbo-1.5.3-r4 +libgcrypt-1.8.4-r1 +libgpg-error-1.36-r2 +libjpeg-turbo-2.0.2-r0 libogg-1.3.3-r2 libpciaccess-0.14-r0 -libpng-1.6.37-r0 -libssh2-1.8.2-r0 -libssl1.1-1.1.1b-r1 +libpng-1.6.37-r1 +libssl1.1-1.1.1c-r0 libstdc++-8.3.0-r0 libtasn1-4.13-r0 -libtheora-1.1.1-r13 -libtls-standalone-2.7.4-r6 +libtheora-1.1.1-r14 +libtls-standalone-2.9.1-r0 libunistring-0.9.10-r0 -libuuid-2.33-r0 -libva-2.2.0-r0 -libvdpau-1.1.1-r2 +libuuid-2.33.2-r0 +libva-2.4.1-r0 +libvdpau-1.2-r0 libvorbis-1.3.6-r2 -libvpx-1.6.1-r1 -libx11-1.6.7-r0 -libxau-1.0.8-r3 -libxcb-1.13-r2 -libxdmcp-1.1.2-r5 -libxext-1.3.3-r3 +libvpx-1.8.0-r0 +libx11-1.6.8-r0 +libxau-1.0.9-r0 +libxcb-1.13.1-r0 +libxdmcp-1.1.3-r0 +libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.9-r1 +libxml2-2.9.9-r2 libxslt-1.1.33-r1 -linux-pam-1.3.0-r0 -musl-1.1.20-r4 -musl-utils-1.1.20-r4 -ncurses-libs-6.1_p20190105-r0 -ncurses-terminfo-6.1_p20190105-r0 -ncurses-terminfo-base-6.1_p20190105-r0 -nettle-3.4.1-r0 -nghttp2-libs-1.35.1-r0 -opus-1.3-r0 -p11-kit-0.23.14-r0 +linux-pam-1.3.0-r1 +musl-1.1.22-r2 +musl-utils-1.1.22-r2 +ncurses-libs-6.1_p20190518-r0 +ncurses-terminfo-6.1_p20190518-r0 +ncurses-terminfo-base-6.1_p20190518-r0 +nettle-3.4.1-r1 +nghttp2-libs-1.38.0-r0 +opus-1.3.1-r0 +p11-kit-0.23.16.1-r0 python2-2.7.16-r1 -readline-7.0.003-r1 +readline-8.0.0-r0 scanelf-1.2.3-r0 sdl2-2.0.9-r0 -shadow-4.5-r2 +shadow-4.6-r2 sqlite-libs-3.28.0-r0 -ssl_client-1.29.3-r10 +ssl_client-1.30.1-r2 tzdata-2019a-r0 -unrar-5.6.8-r0 +unrar-5.7.5-r0 unzip-6.0-r4 -v4l-utils-libs-1.16.2-r0 +v4l-utils-libs-1.16.6-r0 +wayland-libs-client-1.17.0-r0 x264-libs-20180304-r1 -x265-libs-2.8-r1 +x265-libs-3.0-r0 xvidcore-1.3.4-r1 xz-5.2.4-r0 xz-libs-5.2.4-r0 From 62ceebfda3f111ed003a6007f23106199356332d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jul 2019 21:59:48 +0100 Subject: [PATCH 059/525] Bot Updating Templated Files --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7258438..8ba03e9 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,9 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once bazarr ``` + +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. + * You can also remove the old dangling images: `docker image prune` ## Building locally From 7e41018f135a5fdbf5720d961567b7dc58de5a68 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jul 2019 23:30:16 +0200 Subject: [PATCH 060/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 02893fc..9494ab3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ libacl-2.2.52-r6 libass-0.14.0-r0 libattr-2.4.48-r0 libbsd-0.9.1-r0 -libbz2-1.0.6-r6 +libbz2-1.0.6-r7 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1c-r0 libcurl-7.65.1-r0 From aadcddca8ed10b3c41caa27651c9efd012b32a77 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Jul 2019 02:32:31 +0100 Subject: [PATCH 061/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9494ab3..362cc23 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.1.2-r0 alpine-keys-2.1-r2 alsa-lib-1.1.9-r0 -apk-tools-2.10.4-r1 +apk-tools-2.10.4-r2 bash-5.0.0-r0 busybox-1.30.1-r2 ca-certificates-20190108-r0 From 05178a753fd09dc720ddb0c265cd2dd2e72ba398 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Jul 2019 04:31:56 +0200 Subject: [PATCH 062/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 362cc23..61ef0ee 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,7 +37,7 @@ libpciaccess-0.14-r0 libpng-1.6.37-r1 libssl1.1-1.1.1c-r0 libstdc++-8.3.0-r0 -libtasn1-4.13-r0 +libtasn1-4.14-r0 libtheora-1.1.1-r14 libtls-standalone-2.9.1-r0 libunistring-0.9.10-r0 @@ -67,7 +67,7 @@ p11-kit-0.23.16.1-r0 python2-2.7.16-r1 readline-8.0.0-r0 scanelf-1.2.3-r0 -sdl2-2.0.9-r0 +sdl2-2.0.10-r0 shadow-4.6-r2 sqlite-libs-3.28.0-r0 ssl_client-1.30.1-r2 From be5021a5ca55a0ef36dab207c413d2f386c5b573 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Jul 2019 22:29:59 +0200 Subject: [PATCH 063/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 61ef0ee..40b43d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ libcurl-7.65.1-r0 libdrm-2.4.98-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 -libgcrypt-1.8.4-r1 +libgcrypt-1.8.4-r2 libgpg-error-1.36-r2 libjpeg-turbo-2.0.2-r0 libogg-1.3.3-r2 From c53bcde32f96b287c9436eb6fb7faa8f827513f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 11 Aug 2019 00:24:09 +0000 Subject: [PATCH 064/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 40b43d5..f980172 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,8 +55,8 @@ libxfixes-5.0.3-r2 libxml2-2.9.9-r2 libxslt-1.1.33-r1 linux-pam-1.3.0-r1 -musl-1.1.22-r2 -musl-utils-1.1.22-r2 +musl-1.1.22-r3 +musl-utils-1.1.22-r3 ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 From 6189995a11ced042a18437fea2f0f55f2c2cfa27 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 17 Aug 2019 22:26:56 +0200 Subject: [PATCH 065/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f980172..9dda106 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,8 +9,8 @@ ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.65.1-r0 expat-2.2.7-r0 -ffmpeg-4.1.3-r1 -ffmpeg-libs-4.1.3-r1 +ffmpeg-4.1.4-r0 +ffmpeg-libs-4.1.4-r0 fontconfig-2.13.1-r0 freetype-2.10.0-r0 fribidi-1.0.5-r1 From 78005c30c712b81f8cb5cb285e3c314bd3fe077e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Aug 2019 21:26:25 -0400 Subject: [PATCH 066/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9dda106..ef8a0f5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,7 +46,7 @@ libva-2.4.1-r0 libvdpau-1.2-r0 libvorbis-1.3.6-r2 libvpx-1.8.0-r0 -libx11-1.6.8-r0 +libx11-1.6.8-r1 libxau-1.0.9-r0 libxcb-1.13.1-r0 libxdmcp-1.1.3-r0 From 96fb1adb3d1b49ac5ef384902136745aa276fede Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 24 Aug 2019 16:32:58 -0400 Subject: [PATCH 067/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ef8a0f5..fbb8b97 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 nettle-3.4.1-r1 -nghttp2-libs-1.38.0-r0 +nghttp2-libs-1.39.2-r0 opus-1.3.1-r0 p11-kit-0.23.16.1-r0 python2-2.7.16-r1 From d1f8f99c235858153c5ddc10d452fe4c8962c2e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 31 Aug 2019 15:53:35 -0400 Subject: [PATCH 068/525] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- README.md | 40 +++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5f3b493..579dc35 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,6 +62,14 @@ pipeline { echo none fi''', returnStdout: true).trim() + env.FUNDING_TAG = sh( + script: '''#!/bin/bash + if [ -e ./.github/FUNDING.yml ] ; then + cat ./.github/FUNDING.yml | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() } script{ env.LS_RELEASE_NUMBER = sh( @@ -236,15 +244,18 @@ pipeline { docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then + [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ + [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} diff --git a/README.md b/README.md index 8ba03e9..98ad2cc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) +[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") + The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- * regular and timely application updates @@ -9,17 +16,20 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r * regular security updates Find us at: -* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. -* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! +* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [Discourse](https://discourse.linuxserver.io) - post on our community forum. +* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). +* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) -[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) -[![](https://images.microbadger.com/badges/version/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -[![](https://images.microbadger.com/badges/image/linuxserver/bazarr.svg)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg) -![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg) -[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-bazarr/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-bazarr/releases) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") +[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr/bazarr) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr/bazarr) +[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. @@ -28,7 +38,7 @@ Find us at: ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. @@ -134,17 +144,17 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel * Shell access whilst the container is running: `docker exec -it bazarr /bin/bash` * To monitor the logs of the container in realtime: `docker logs -f bazarr` -* container version number +* container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bazarr` * image version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/bazarr` ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. - -Below are the instructions for updating containers: - +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + ### Via Docker Run/Create * Update the image: `docker pull linuxserver/bazarr` * Stop the running container: `docker stop bazarr` @@ -175,7 +185,7 @@ Below are the instructions for updating containers: ## Building locally -If you want to make local modifications to these images for development purposes or just to customize the logic: +If you want to make local modifications to these images for development purposes or just to customize the logic: ``` git clone https://github.com/linuxserver/docker-bazarr.git cd docker-bazarr From 0694205727028d9f844198f0f1eb77931c7e521a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 31 Aug 2019 15:55:15 -0400 Subject: [PATCH 069/525] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100755 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100755 index 0000000..7972213 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: linuxserver From 675e99fdf30f720f7720574e3198439c24595ae0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 31 Aug 2019 16:22:26 -0400 Subject: [PATCH 070/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fbb8b97..6d0d1ec 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,7 +71,7 @@ sdl2-2.0.10-r0 shadow-4.6-r2 sqlite-libs-3.28.0-r0 ssl_client-1.30.1-r2 -tzdata-2019a-r0 +tzdata-2019b-r0 unrar-5.7.5-r0 unzip-6.0-r4 v4l-utils-libs-1.16.6-r0 From 88517a7150d022adae7ff4cca4aa4e492f4281cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Sep 2019 00:00:37 -0400 Subject: [PATCH 071/525] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 98ad2cc..c2e7342 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-bazarr/releases) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") [![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr/bazarr) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr/bazarr) +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr) [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) From 58b23cf7002efd34c2987df0d3baf0c099ab909c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Sep 2019 17:21:46 -0400 Subject: [PATCH 072/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6d0d1ec..1e88d17 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.65.1-r0 -expat-2.2.7-r0 +expat-2.2.7-r1 ffmpeg-4.1.4-r0 ffmpeg-libs-4.1.4-r0 fontconfig-2.13.1-r0 @@ -24,7 +24,7 @@ libattr-2.4.48-r0 libbsd-0.9.1-r0 libbz2-1.0.6-r7 libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1c-r0 +libcrypto1.1-1.1.1d-r0 libcurl-7.65.1-r0 libdrm-2.4.98-r0 libffi-3.2.1-r6 @@ -35,7 +35,7 @@ libjpeg-turbo-2.0.2-r0 libogg-1.3.3-r2 libpciaccess-0.14-r0 libpng-1.6.37-r1 -libssl1.1-1.1.1c-r0 +libssl1.1-1.1.1d-r0 libstdc++-8.3.0-r0 libtasn1-4.14-r0 libtheora-1.1.1-r14 From a0d3a6889ab88d33de120e7c48f224380474ebc9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Sep 2019 15:18:15 +0100 Subject: [PATCH 073/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1e88d17..f022e56 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 -curl-7.65.1-r0 +curl-7.66.0-r0 expat-2.2.7-r1 ffmpeg-4.1.4-r0 ffmpeg-libs-4.1.4-r0 @@ -25,7 +25,7 @@ libbsd-0.9.1-r0 libbz2-1.0.6-r7 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1d-r0 -libcurl-7.65.1-r0 +libcurl-7.66.0-r0 libdrm-2.4.98-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 From d7fd3548bfc367004448387060f7a01c3ed769f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 Sep 2019 09:22:45 -0400 Subject: [PATCH 074/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f022e56..e19fcd5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.66.0-r0 -expat-2.2.7-r1 +expat-2.2.8-r0 ffmpeg-4.1.4-r0 ffmpeg-libs-4.1.4-r0 fontconfig-2.13.1-r0 From 3bfb78f0e401e70c705f7653cd6532a14ff1d372 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Oct 2019 19:59:54 +0100 Subject: [PATCH 075/525] Bot Updating Templated Files --- Jenkinsfile | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 579dc35..49c4b6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,10 @@ pipeline { agent { label 'X86-64-MULTI' } + options { + buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) + parallelsAlwaysFailFast() + } // Input to determine if this is a package check parameters { string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') @@ -54,22 +58,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.LICENSE_TAG = sh( - script: '''#!/bin/bash - if [ -e LICENSE ] ; then - cat LICENSE | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() - env.FUNDING_TAG = sh( - script: '''#!/bin/bash - if [ -e ./.github/FUNDING.yml ] ; then - cat ./.github/FUNDING.yml | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' } script{ env.LS_RELEASE_NUMBER = sh( @@ -240,35 +229,32 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest - if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ - [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f development - cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git add ${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} else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Templated Files' + git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi rm -Rf ${TEMPDIR}''' From b659621dfe13db55a362fc765d6927cb5bedca98 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Oct 2019 15:00:51 -0400 Subject: [PATCH 076/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 38 ++++++++++++++++++++++---------- .github/PULL_REQUEST_TEMPLATE.md | 30 ++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 04ae370..4b22972 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,20 +1,34 @@ - - [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - +If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. - - - - + +------------------------------ - +## Expected Behavior + - - +## Current Behavior + -## Thanks, team linuxserver.io +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f6a6381..26d5031 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,10 +6,34 @@ - + + - + -## Thanks, team linuxserver.io + + + + + + +------------------------------ + +We welcome all PR’s though this doesn’t guarantee it will be accepted. + +## Description: + + +## Benefits of this PR and context: + + +## How Has This Been Tested? + + + + + +## Source / References: + From 28017eabdbf0743353445d17d104ba90d99267b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Oct 2019 16:15:55 -0400 Subject: [PATCH 077/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e19fcd5..3fbd08d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ libcurl-7.66.0-r0 libdrm-2.4.98-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 -libgcrypt-1.8.4-r2 +libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 libjpeg-turbo-2.0.2-r0 libogg-1.3.3-r2 @@ -69,7 +69,7 @@ readline-8.0.0-r0 scanelf-1.2.3-r0 sdl2-2.0.10-r0 shadow-4.6-r2 -sqlite-libs-3.28.0-r0 +sqlite-libs-3.28.0-r1 ssl_client-1.30.1-r2 tzdata-2019b-r0 unrar-5.7.5-r0 From ed4297725a576ac909a03af774a96ae57521d352 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 19 Oct 2019 16:11:26 -0400 Subject: [PATCH 078/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3fbd08d..494162f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,7 +71,7 @@ sdl2-2.0.10-r0 shadow-4.6-r2 sqlite-libs-3.28.0-r1 ssl_client-1.30.1-r2 -tzdata-2019b-r0 +tzdata-2019c-r0 unrar-5.7.5-r0 unzip-6.0-r4 v4l-utils-libs-1.16.6-r0 From 570aa46988a1389ec040daf2952f9351d9045732 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Oct 2019 19:00:22 -0400 Subject: [PATCH 079/525] Bot Updating Templated Files --- Jenkinsfile | 162 +++++++++++++++++++++++++++++++++++++++------------- README.md | 16 ++++-- 2 files changed, 133 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 49c4b6e..e04f14d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,8 @@ pipeline { environment { BUILDS_DISCORD=credentials('build_webhook_url') GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') + GITLAB_NAMESPACE=credentials('gitlab-namespace-id') EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -138,6 +140,9 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -156,6 +161,9 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -174,6 +182,9 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -281,6 +292,26 @@ pipeline { } } } + /* ####################### + GitLab Mirroring + ####################### */ + // Ping into Gitlab to mirror this repo and have a registry endpoint + stage("GitLab Mirror"){ + when { + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + } + } /* ############### Build Container ############### */ @@ -512,19 +543,32 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { - echo 'Logging into DockerHub' sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development + docker push ${PUSHIMAGE}:development + docker push ${PUSHIMAGE}:${META_TAG} + done + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:development || : + done ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:development" - sh "docker push ${IMAGE}:development" - sh "docker push ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:${META_TAG} \ - ${IMAGE}:development || :''' - } } } @@ -541,46 +585,81 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-development" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-development" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-development" - sh "docker push ${IMAGE}:amd64-${META_TAG}" - sh "docker push ${IMAGE}:arm32v7-${META_TAG}" - sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-development" - sh "docker push ${IMAGE}:arm32v7-development" - sh "docker push ${IMAGE}:arm64v8-development" - sh "docker manifest push --purge ${IMAGE}:development || :" - sh "docker manifest create ${IMAGE}:development ${IMAGE}:amd64-development ${IMAGE}:arm32v7-development ${IMAGE}:arm64v8-development" - sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm32v7-development --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:development ${IMAGE}:arm64v8-development --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" - sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:development" - sh "docker manifest push --purge ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-development \ - ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-development \ - ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-development \ + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; 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-development + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-development + docker push ${MANIFESTIMAGE}:arm32v7-development + docker push ${MANIFESTIMAGE}:arm64v8-development + docker manifest push --purge ${MANIFESTIMAGE}:development || : + docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development + docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:development + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + done + for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:development + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-development + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-development + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:development + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-development + docker push ${LEGACYIMAGE}:arm64v8-development + done + ''' + sh '''#! /bin/bash + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:amd64-${META_TAG} \ + ${DELETEIMAGE}:amd64-development \ + ${DELETEIMAGE}:arm32v7-${META_TAG} \ + ${DELETEIMAGE}:arm32v7-development \ + ${DELETEIMAGE}:arm64v8-${META_TAG} \ + ${DELETEIMAGE}:arm64v8-development || : + done + docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ''' } } } @@ -675,5 +754,8 @@ pipeline { } } } + cleanup { + cleanWs() + } } } diff --git a/README.md b/README.md index c2e7342..aa8e095 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ [![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -20,15 +21,20 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-bazarr/releases) + +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-bazarr/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bazarr) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bazarr) +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bazarr) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bazarr) [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) From 89a419910ea2fbf86abac6f386630abf24865461 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Oct 2019 19:20:05 -0400 Subject: [PATCH 080/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 494162f..30bc927 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ alpine-keys-2.1-r2 alsa-lib-1.1.9-r0 apk-tools-2.10.4-r2 bash-5.0.0-r0 -busybox-1.30.1-r2 +busybox-1.30.1-r3 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 @@ -70,7 +70,7 @@ scanelf-1.2.3-r0 sdl2-2.0.10-r0 shadow-4.6-r2 sqlite-libs-3.28.0-r1 -ssl_client-1.30.1-r2 +ssl_client-1.30.1-r3 tzdata-2019c-r0 unrar-5.7.5-r0 unzip-6.0-r4 From 8607a5f58bed386359d55e3175260a5d95f2a2ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Oct 2019 19:21:59 +0000 Subject: [PATCH 081/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 30bc927..627aa29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,7 +53,7 @@ libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 libxml2-2.9.9-r2 -libxslt-1.1.33-r1 +libxslt-1.1.33-r2 linux-pam-1.3.0-r1 musl-1.1.22-r3 musl-utils-1.1.22-r3 From 51a4608e6486186048f8924ac67ea2ebecb7e98e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 Nov 2019 21:18:48 -0500 Subject: [PATCH 082/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 627aa29..aef8052 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ ffmpeg-4.1.4-r0 ffmpeg-libs-4.1.4-r0 fontconfig-2.13.1-r0 freetype-2.10.0-r0 -fribidi-1.0.5-r1 +fribidi-1.0.5-r2 gdbm-1.13-r1 gmp-6.1.2-r1 gnutls-3.6.8-r0 From 8bb39049ceb9aed7d1b3892bfc17d2e3173a9300 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Nov 2019 01:21:04 +0000 Subject: [PATCH 083/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index aef8052..04da83a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libffi-3.2.1-r6 libgcc-8.3.0-r0 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 -libjpeg-turbo-2.0.2-r0 +libjpeg-turbo-2.0.3-r0 libogg-1.3.3-r2 libpciaccess-0.14-r0 libpng-1.6.37-r1 From e6cf9c72bb3213ee89ffdc8741545c5f78caa904 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 27 Nov 2019 23:00:03 +0100 Subject: [PATCH 084/525] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- README.md | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e04f14d..73c9693 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -629,7 +629,7 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do + for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} @@ -743,12 +743,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST --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://wiki.jenkins-ci.org/download/attachments/2916393/headshot.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 --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://wiki.jenkins-ci.org/download/attachments/2916393/headshot.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 aa8e095..2526b46 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -22,7 +21,6 @@ Find us at: * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. -* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) @@ -124,6 +122,18 @@ Container images are configured using parameters passed at runtime (such as thos | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | +## Environment variables from files (Docker secrets) + +You can set any environment variable from a file by using a special prepend `FILE__`. + +As an example: + +``` +-e FILE__PASSWORD=/run/secrets/mysecretpassword +``` + +Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. + ## User / Group Identifiers When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. From fa8979b2c68173e60718fc22aab35fc10d95c8cf Mon Sep 17 00:00:00 2001 From: chbmb Date: Mon, 2 Dec 2019 23:39:10 +0000 Subject: [PATCH 085/525] Update to use Python3 --- Dockerfile | 7 +++---- Dockerfile.aarch64 | 7 +++---- Dockerfile.armhf | 7 +++---- root/etc/services.d/bazarr/run | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index bed137a..69e773f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,15 +16,14 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ - py2-pip \ - python2-dev && \ + python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ curl \ ffmpeg \ libxml2 \ libxslt \ - python2 \ + python3 \ unrar \ unzip && \ echo "**** install bazarr ****" && \ @@ -42,7 +41,7 @@ RUN \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bfee541..d3e38dc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,15 +16,14 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ - py2-pip \ - python2-dev && \ + python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ curl \ ffmpeg \ libxml2 \ libxslt \ - python2 \ + python3 \ unrar \ unzip && \ echo "**** install bazarr ****" && \ @@ -42,7 +41,7 @@ RUN \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1e10e46..3abfc65 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,15 +16,14 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ - py2-pip \ - python2-dev && \ + python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ curl \ ffmpeg \ libxml2 \ libxslt \ - python2 \ + python3 \ unrar \ unzip && \ echo "**** install bazarr ****" && \ @@ -42,7 +41,7 @@ RUN \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run index 330b669..7057794 100644 --- a/root/etc/services.d/bazarr/run +++ b/root/etc/services.d/bazarr/run @@ -4,5 +4,5 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" exec \ - s6-setuidgid abc python /app/bazarr/bazarr.py \ + s6-setuidgid abc python3 /app/bazarr/bazarr.py \ --no-update --config /config From 01b6829358d1658c0e8d8af8cdfb958b605174f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Dec 2019 04:53:13 -0500 Subject: [PATCH 086/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 04da83a..2c9896e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,7 +64,7 @@ nettle-3.4.1-r1 nghttp2-libs-1.39.2-r0 opus-1.3.1-r0 p11-kit-0.23.16.1-r0 -python2-2.7.16-r1 +python3-3.7.5-r1 readline-8.0.0-r0 scanelf-1.2.3-r0 sdl2-2.0.10-r0 From 904ae8444c886cdaa18a9f9dc5969629891ae6f2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 18 Dec 2019 07:18:39 -0500 Subject: [PATCH 087/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2c9896e..24ab601 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -69,7 +69,7 @@ readline-8.0.0-r0 scanelf-1.2.3-r0 sdl2-2.0.10-r0 shadow-4.6-r2 -sqlite-libs-3.28.0-r1 +sqlite-libs-3.28.0-r2 ssl_client-1.30.1-r3 tzdata-2019c-r0 unrar-5.7.5-r0 From a4c6971f5afd6e4bcb5ce8b5fb146a0fa7acf4ae Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 19 Dec 2019 16:17:15 -0800 Subject: [PATCH 088/525] Rebasing to Alpine 3.11 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69e773f..2342074 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.10 +FROM lsiobase/alpine:3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d3e38dc..747e0d5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.10 +FROM lsiobase/alpine:arm64v8-3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3abfc65..b2fc471 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.10 +FROM lsiobase/alpine:arm32v7-3.11 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 1ef0e40..6061acb 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } From d0fe868696902bba0128b1ae385515ae88048718 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 17:38:31 +0000 Subject: [PATCH 089/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2526b46..d0f01bd 100644 --- a/README.md +++ b/README.md @@ -220,6 +220,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. * **17.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. * **13.06.19:** - Add env variable for setting umask. From 01f92bb4dda62746b51c6d8777d8c410effcb564 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 12:52:42 -0500 Subject: [PATCH 090/525] Bot Updating Package Versions --- package_versions.txt | 112 +++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 24ab601..e938012 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,84 +1,84 @@ -alpine-baselayout-3.1.2-r0 +alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 -alsa-lib-1.1.9-r0 -apk-tools-2.10.4-r2 -bash-5.0.0-r0 -busybox-1.30.1-r3 -ca-certificates-20190108-r0 -ca-certificates-cacert-20190108-r0 +alsa-lib-1.2.1.2-r0 +apk-tools-2.10.4-r3 +bash-5.0.11-r1 +busybox-1.31.1-r8 +ca-certificates-20191127-r0 +ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 -curl-7.66.0-r0 -expat-2.2.8-r0 -ffmpeg-4.1.4-r0 -ffmpeg-libs-4.1.4-r0 -fontconfig-2.13.1-r0 -freetype-2.10.0-r0 -fribidi-1.0.5-r2 +curl-7.67.0-r0 +expat-2.2.9-r0 +ffmpeg-4.2.1-r3 +ffmpeg-libs-4.2.1-r3 +fontconfig-2.13.1-r2 +freetype-2.10.1-r0 +fribidi-1.0.8-r0 gdbm-1.13-r1 gmp-6.1.2-r1 -gnutls-3.6.8-r0 +gnutls-3.6.10-r0 lame-3.100-r0 -libacl-2.2.52-r6 +libacl-2.2.53-r0 libass-0.14.0-r0 libattr-2.4.48-r0 -libbsd-0.9.1-r0 -libbz2-1.0.6-r7 -libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1d-r0 -libcurl-7.66.0-r0 -libdrm-2.4.98-r0 +libbsd-0.10.0-r0 +libbz2-1.0.8-r1 +libc-utils-0.7.2-r0 +libcrypto1.1-1.1.1d-r2 +libcurl-7.67.0-r0 +libdrm-2.4.100-r0 libffi-3.2.1-r6 -libgcc-8.3.0-r0 +libgcc-9.2.0-r3 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 libjpeg-turbo-2.0.3-r0 -libogg-1.3.3-r2 -libpciaccess-0.14-r0 +libogg-1.3.4-r0 +libpciaccess-0.16-r0 libpng-1.6.37-r1 -libssl1.1-1.1.1d-r0 -libstdc++-8.3.0-r0 -libtasn1-4.14-r0 +libssl1.1-1.1.1d-r2 +libstdc++-9.2.0-r3 +libtasn1-4.15.0-r0 libtheora-1.1.1-r14 libtls-standalone-2.9.1-r0 libunistring-0.9.10-r0 -libuuid-2.33.2-r0 -libva-2.4.1-r0 -libvdpau-1.2-r0 +libuuid-2.34-r1 +libva-2.6.0-r0 +libvdpau-1.3-r0 libvorbis-1.3.6-r2 -libvpx-1.8.0-r0 -libx11-1.6.8-r1 +libvpx-1.8.1-r0 +libx11-1.6.9-r0 libxau-1.0.9-r0 libxcb-1.13.1-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.9-r2 -libxslt-1.1.33-r2 -linux-pam-1.3.0-r1 -musl-1.1.22-r3 -musl-utils-1.1.22-r3 -ncurses-libs-6.1_p20190518-r0 -ncurses-terminfo-6.1_p20190518-r0 -ncurses-terminfo-base-6.1_p20190518-r0 -nettle-3.4.1-r1 -nghttp2-libs-1.39.2-r0 +libxml2-2.9.10-r1 +libxslt-1.1.34-r0 +linux-pam-1.3.1-r1 +musl-1.1.24-r0 +musl-utils-1.1.24-r0 +ncurses-libs-6.1_p20191130-r0 +ncurses-terminfo-6.1_p20191130-r0 +ncurses-terminfo-base-6.1_p20191130-r0 +nettle-3.5.1-r0 +nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 -p11-kit-0.23.16.1-r0 -python3-3.7.5-r1 -readline-8.0.0-r0 -scanelf-1.2.3-r0 +p11-kit-0.23.18.1-r0 +python3-3.8.0-r0 +readline-8.0.1-r0 +scanelf-1.2.4-r0 sdl2-2.0.10-r0 -shadow-4.6-r2 -sqlite-libs-3.28.0-r2 -ssl_client-1.30.1-r3 +shadow-4.7-r0 +sqlite-libs-3.30.1-r1 +ssl_client-1.31.1-r8 tzdata-2019c-r0 -unrar-5.7.5-r0 +unrar-5.8.5-r0 unzip-6.0-r4 -v4l-utils-libs-1.16.6-r0 +v4l-utils-libs-1.18.0-r0 wayland-libs-client-1.17.0-r0 -x264-libs-20180304-r1 -x265-libs-3.0-r0 -xvidcore-1.3.4-r1 +x264-libs-20191119-r0 +x265-libs-3.2.1-r0 +xvidcore-1.3.5-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 -zlib-1.2.11-r1 +zlib-1.2.11-r3 From ee169607e5d10cac7d8763f6a53725aeddedeb14 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 Dec 2019 10:14:52 -0500 Subject: [PATCH 091/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e938012..f0fe345 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ ca-certificates-20191127-r0 ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 curl-7.67.0-r0 -expat-2.2.9-r0 +expat-2.2.9-r1 ffmpeg-4.2.1-r3 ffmpeg-libs-4.2.1-r3 fontconfig-2.13.1-r2 From 85b2f4f5822320b525f28b68f8c10f138b70381d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Dec 2019 19:15:46 -0500 Subject: [PATCH 092/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f0fe345..c2536d2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ libattr-2.4.48-r0 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r0 -libcrypto1.1-1.1.1d-r2 +libcrypto1.1-1.1.1d-r3 libcurl-7.67.0-r0 libdrm-2.4.100-r0 libffi-3.2.1-r6 @@ -35,7 +35,7 @@ libjpeg-turbo-2.0.3-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libssl1.1-1.1.1d-r2 +libssl1.1-1.1.1d-r3 libstdc++-9.2.0-r3 libtasn1-4.15.0-r0 libtheora-1.1.1-r14 @@ -68,7 +68,7 @@ python3-3.8.0-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 -shadow-4.7-r0 +shadow-4.7-r1 sqlite-libs-3.30.1-r1 ssl_client-1.31.1-r8 tzdata-2019c-r0 From 11b8c6a725197257a582edf94edd3a5b6b74c1c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 Jan 2020 20:18:05 +0000 Subject: [PATCH 093/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c2536d2..a8e71fe 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,7 +64,7 @@ nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 p11-kit-0.23.18.1-r0 -python3-3.8.0-r0 +python3-3.8.1-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 From 1ca0fc1b16522bd636f853721836b3a482fd6c43 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Jan 2020 13:14:57 -0500 Subject: [PATCH 094/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a8e71fe..35773da 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libffi-3.2.1-r6 libgcc-9.2.0-r3 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 -libjpeg-turbo-2.0.3-r0 +libjpeg-turbo-2.0.4-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 From a338a464d60142ec76e3ff235090776a09bbd9df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jan 2020 17:21:15 -0500 Subject: [PATCH 095/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 35773da..14fad70 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ alpine-keys-2.1-r2 alsa-lib-1.2.1.2-r0 apk-tools-2.10.4-r3 bash-5.0.11-r1 -busybox-1.31.1-r8 +busybox-1.31.1-r9 ca-certificates-20191127-r0 ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 @@ -70,7 +70,7 @@ scanelf-1.2.4-r0 sdl2-2.0.10-r0 shadow-4.7-r1 sqlite-libs-3.30.1-r1 -ssl_client-1.31.1-r8 +ssl_client-1.31.1-r9 tzdata-2019c-r0 unrar-5.8.5-r0 unzip-6.0-r4 From 3a427442b78e69de36fe096d5a0dc9729dc28294 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Feb 2020 21:21:36 +0000 Subject: [PATCH 096/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 14fad70..d6c36d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,8 +4,8 @@ alsa-lib-1.2.1.2-r0 apk-tools-2.10.4-r3 bash-5.0.11-r1 busybox-1.31.1-r9 -ca-certificates-20191127-r0 -ca-certificates-cacert-20191127-r0 +ca-certificates-20191127-r1 +ca-certificates-cacert-20191127-r1 coreutils-8.31-r0 curl-7.67.0-r0 expat-2.2.9-r1 From a4f5d952e09250bd93153fc3ef1675287f2947a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 15 Feb 2020 15:19:18 +0100 Subject: [PATCH 097/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d6c36d5..51a7924 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libxcb-1.13.1-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r1 +libxml2-2.9.10-r2 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r0 From b7372beeb7d2cb17e101a2aec0588870e7be0da3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 29 Feb 2020 16:08:26 -0500 Subject: [PATCH 098/525] Bot Updating Package Versions --- package_versions.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 51a7924..ba539d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,14 +57,13 @@ libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r0 musl-utils-1.1.24-r0 -ncurses-libs-6.1_p20191130-r0 -ncurses-terminfo-6.1_p20191130-r0 -ncurses-terminfo-base-6.1_p20191130-r0 +ncurses-libs-6.1_p20200118-r2 +ncurses-terminfo-base-6.1_p20200118-r2 nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 p11-kit-0.23.18.1-r0 -python3-3.8.1-r0 +python3-3.8.2-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 From 433735c177f1683d8d012c991f17f0a2e5355e02 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Mar 2020 13:13:01 -0500 Subject: [PATCH 099/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ba539d5..3102972 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,7 +55,7 @@ libxfixes-5.0.3-r2 libxml2-2.9.10-r2 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 -musl-1.1.24-r0 +musl-1.1.24-r1 musl-utils-1.1.24-r0 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 From 3607db603038874a921e63a1e5a1fad83c01302a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 7 Mar 2020 21:14:23 +0000 Subject: [PATCH 100/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3102972..3f3e0fb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -56,7 +56,7 @@ libxml2-2.9.10-r2 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r1 -musl-utils-1.1.24-r0 +musl-utils-1.1.24-r1 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 nettle-3.5.1-r0 From 32ff9e9056455f9e3976b6a094628724a7337ab0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 Mar 2020 13:13:12 +0100 Subject: [PATCH 101/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3f3e0fb..899f200 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ libcrypto1.1-1.1.1d-r3 libcurl-7.67.0-r0 libdrm-2.4.100-r0 libffi-3.2.1-r6 -libgcc-9.2.0-r3 +libgcc-9.2.0-r4 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 libjpeg-turbo-2.0.4-r0 @@ -36,7 +36,7 @@ libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libssl1.1-1.1.1d-r3 -libstdc++-9.2.0-r3 +libstdc++-9.2.0-r4 libtasn1-4.15.0-r0 libtheora-1.1.1-r14 libtls-standalone-2.9.1-r0 @@ -55,7 +55,7 @@ libxfixes-5.0.3-r2 libxml2-2.9.10-r2 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 -musl-1.1.24-r1 +musl-1.1.24-r2 musl-utils-1.1.24-r1 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 From 51120362383e7cc641306a2d417003f98b022aac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Mar 2020 16:16:49 -0400 Subject: [PATCH 102/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 899f200..d0eeb2b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 alsa-lib-1.2.1.2-r0 -apk-tools-2.10.4-r3 +apk-tools-2.10.5-r0 bash-5.0.11-r1 busybox-1.31.1-r9 ca-certificates-20191127-r1 @@ -56,7 +56,7 @@ libxml2-2.9.10-r2 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r2 -musl-utils-1.1.24-r1 +musl-utils-1.1.24-r2 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 nettle-3.5.1-r0 From c68f926f09959163e11fb81f077c1dc35c6bbbc8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Mar 2020 20:44:28 +0000 Subject: [PATCH 103/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d0eeb2b..e5328eb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -72,7 +72,7 @@ sqlite-libs-3.30.1-r1 ssl_client-1.31.1-r9 tzdata-2019c-r0 unrar-5.8.5-r0 -unzip-6.0-r4 +unzip-6.0-r5 v4l-utils-libs-1.18.0-r0 wayland-libs-client-1.17.0-r0 x264-libs-20191119-r0 From 60c538bc594cf8871db61e60d87f3cd398b3c306 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 28 Mar 2020 11:18:17 +0000 Subject: [PATCH 104/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e5328eb..092d08f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -72,7 +72,7 @@ sqlite-libs-3.30.1-r1 ssl_client-1.31.1-r9 tzdata-2019c-r0 unrar-5.8.5-r0 -unzip-6.0-r5 +unzip-6.0-r6 v4l-utils-libs-1.18.0-r0 wayland-libs-client-1.17.0-r0 x264-libs-20191119-r0 From 62486cd29a06ab4ed064843624495bc781c02ec3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 4 Apr 2020 03:27:17 +0000 Subject: [PATCH 105/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 092d08f..2ce0d1b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ freetype-2.10.1-r0 fribidi-1.0.8-r0 gdbm-1.13-r1 gmp-6.1.2-r1 -gnutls-3.6.10-r0 +gnutls-3.6.10-r1 lame-3.100-r0 libacl-2.2.53-r0 libass-0.14.0-r0 From 9ee3a05234335740fd10758077a717e3145abab3 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 8 Apr 2020 10:21:34 -0500 Subject: [PATCH 106/525] Removed /downloads and /music volumes from Dockerfiles --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.armhf | 6 +++--- readme-vars.yml | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2342074..92a3845 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN \ curl \ ffmpeg \ libxml2 \ - libxslt \ + libxslt \ python3 \ unrar \ unzip && \ @@ -42,7 +42,7 @@ RUN \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ @@ -55,4 +55,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 747e0d5..df9959d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,7 +22,7 @@ RUN \ curl \ ffmpeg \ libxml2 \ - libxslt \ + libxslt \ python3 \ unrar \ unzip && \ @@ -42,7 +42,7 @@ RUN \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ @@ -55,4 +55,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b2fc471..f57d586 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,7 +22,7 @@ RUN \ curl \ ffmpeg \ libxml2 \ - libxslt \ + libxslt \ python3 \ unrar \ unzip && \ @@ -42,7 +42,7 @@ RUN \ rm -Rf /app/bazarr/bin && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ @@ -55,4 +55,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv +VOLUME /config diff --git a/readme-vars.yml b/readme-vars.yml index 6061acb..f93c40c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } From 0f083f52ff665c3d95e4934f55b712536ff88dbc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Apr 2020 16:00:14 -0400 Subject: [PATCH 107/525] Bot Updating Templated Files --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0f01bd..a258f78 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") -The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- +The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: * regular and timely application updates * easy user mappings (PGID, PUID) @@ -88,7 +88,7 @@ Compatible with docker-compose v2 schemas. ``` --- -version: "2" +version: "2.1" services: bazarr: image: linuxserver/bazarr @@ -155,6 +155,11 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel - You must complete all the setup parameters in the webui before you can save the config. +## Docker Mods +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") + +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. + ## Support Info From 5049e8e2a80f1f7511a0db5eab4933d217da6119 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Apr 2020 21:52:41 +0000 Subject: [PATCH 108/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a258f78..69a5bdb 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. * **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. * **17.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. From 2bf12275c83d2796572b09eda1d9e9d4f7585536 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Apr 2020 15:19:28 +0100 Subject: [PATCH 109/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2ce0d1b..68ade62 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,8 +57,8 @@ libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r2 musl-utils-1.1.24-r2 -ncurses-libs-6.1_p20200118-r2 -ncurses-terminfo-base-6.1_p20200118-r2 +ncurses-libs-6.1_p20200118-r3 +ncurses-terminfo-base-6.1_p20200118-r3 nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 From 27cd213d925a75f41631bfebf9c31cfa3f3e5868 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 Apr 2020 07:28:51 -0400 Subject: [PATCH 110/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 68ade62..babea92 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ libattr-2.4.48-r0 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r0 -libcrypto1.1-1.1.1d-r3 +libcrypto1.1-1.1.1g-r0 libcurl-7.67.0-r0 libdrm-2.4.100-r0 libffi-3.2.1-r6 @@ -35,7 +35,7 @@ libjpeg-turbo-2.0.4-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libssl1.1-1.1.1d-r3 +libssl1.1-1.1.1g-r0 libstdc++-9.2.0-r4 libtasn1-4.15.0-r0 libtheora-1.1.1-r14 From bdfc03448bd492fcbb41099c1f5b1f09808a140a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Apr 2020 03:59:48 +0000 Subject: [PATCH 111/525] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + Jenkinsfile | 142 ++++++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 66 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7972213..7eaac77 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ +github: linuxserver open_collective: linuxserver diff --git a/Jenkinsfile b/Jenkinsfile index 73c9693..55c4067 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -359,7 +359,9 @@ pipeline { sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm32v7-${META_TAG} \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -386,7 +388,9 @@ pipeline { sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm64v8-${META_TAG} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -551,18 +555,22 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development + docker push ${PUSHIMAGE}:development + docker push ${PUSHIMAGE}:${META_TAG} + done + ''' + } sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development - docker push ${PUSHIMAGE}:development - docker push ${PUSHIMAGE}:${META_TAG} - done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ @@ -593,59 +601,61 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; 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-development - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-development - docker push ${MANIFESTIMAGE}:arm32v7-development - docker push ${MANIFESTIMAGE}:arm64v8-development - docker manifest push --purge ${MANIFESTIMAGE}:development || : - docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development - docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:development - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - done - for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:development - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-development - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-development - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:development - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-development - docker push ${LEGACYIMAGE}:arm64v8-development - done - ''' + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + if [ "${CI}" == "false" ]; then + docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; 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-development + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-development + docker push ${MANIFESTIMAGE}:arm32v7-development + docker push ${MANIFESTIMAGE}:arm64v8-development + docker manifest push --purge ${MANIFESTIMAGE}:development || : + docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development + docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:development + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + done + for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:development + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-development + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-development + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:development + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-development + docker push ${LEGACYIMAGE}:arm64v8-development + done + ''' + } sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ From e8c7c5b17cb9ca330e30463a4ace7bb8ed0506b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 May 2020 05:17:43 -0400 Subject: [PATCH 112/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index babea92..df5fecb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,8 +57,8 @@ libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r2 musl-utils-1.1.24-r2 -ncurses-libs-6.1_p20200118-r3 -ncurses-terminfo-base-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r4 +ncurses-terminfo-base-6.1_p20200118-r4 nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 @@ -70,7 +70,7 @@ sdl2-2.0.10-r0 shadow-4.7-r1 sqlite-libs-3.30.1-r1 ssl_client-1.31.1-r9 -tzdata-2019c-r0 +tzdata-2020a-r0 unrar-5.8.5-r0 unzip-6.0-r6 v4l-utils-libs-1.18.0-r0 From 088ff4560fc42fb0fac9e11d6d6de227939721e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 6 May 2020 12:20:40 +0000 Subject: [PATCH 113/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index df5fecb..d9e2314 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libxcb-1.13.1-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r2 +libxml2-2.9.10-r3 libxslt-1.1.34-r0 linux-pam-1.3.1-r1 musl-1.1.24-r2 From b10d7e27cbd68e76d3e1824f82b303a901989205 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 May 2020 01:22:03 +0000 Subject: [PATCH 114/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d9e2314..004b6c8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -68,7 +68,7 @@ readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 shadow-4.7-r1 -sqlite-libs-3.30.1-r1 +sqlite-libs-3.30.1-r2 ssl_client-1.31.1-r9 tzdata-2020a-r0 unrar-5.8.5-r0 From fb57eeeb4dfcba37359c761b75880640e67d9768 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 13 May 2020 16:19:43 -0400 Subject: [PATCH 115/525] add donation links for Bazarr --- .github/FUNDING.yml | 1 + Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 3 +++ readme-vars.yml | 1 + root/donate.txt | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 root/donate.txt diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7eaac77..3341d04 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ github: linuxserver open_collective: linuxserver +custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url","https://beerpay.io/morpheus65535/bazarr",] diff --git a/Jenkinsfile b/Jenkinsfile index 55c4067..82c944c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,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 ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( diff --git a/README.md b/README.md index 69a5bdb..1f8cab0 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.05.20:** - Add donation links for Bazarr to container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. * **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e122b38..80a494f 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -29,3 +29,6 @@ repo_vars: - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - CI_WEBPATH='' +sponsor_links: + - { name: "Bazarr - PayPal", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" } + - { name: "Bazarr - Beerpay", url: "https://beerpay.io/morpheus65535/bazarr" } diff --git a/readme-vars.yml b/readme-vars.yml index f93c40c..edd5c84 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } diff --git a/root/donate.txt b/root/donate.txt new file mode 100644 index 0000000..21c5f58 --- /dev/null +++ b/root/donate.txt @@ -0,0 +1,2 @@ +Bazarr - PayPal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url +Bazarr - Beerpay: https://beerpay.io/morpheus65535/bazarr From 769b6630f73f136c25999f7ca9fc6394b0d94d0c Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 20 May 2020 12:56:47 -0500 Subject: [PATCH 116/525] Remove Bazarr Beerpay link (dev branch) https://github.com/morpheus65535/bazarr/commit/2a2e0d8c2ee9b935c4e3e1d95d08d9476ad9b828 beerpay is closing/closed --- jenkins-vars.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 80a494f..e1366fc 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -30,5 +30,4 @@ repo_vars: - CI_AUTH='user:password' - CI_WEBPATH='' sponsor_links: - - { name: "Bazarr - PayPal", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" } - - { name: "Bazarr - Beerpay", url: "https://beerpay.io/morpheus65535/bazarr" } + - { name: "Bazarr", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" } From 3bcf6bd630d9e975543d6520914161dc57e29e63 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 May 2020 01:15:58 +0200 Subject: [PATCH 117/525] Bot Updating Templated Files --- .github/FUNDING.yml | 2 +- root/donate.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3341d04..9a04cd4 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ github: linuxserver open_collective: linuxserver -custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url","https://beerpay.io/morpheus65535/bazarr",] +custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url",] diff --git a/root/donate.txt b/root/donate.txt index 21c5f58..cdb04fd 100644 --- a/root/donate.txt +++ b/root/donate.txt @@ -1,2 +1 @@ -Bazarr - PayPal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url -Bazarr - Beerpay: https://beerpay.io/morpheus65535/bazarr +Bazarr: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url From eaf041850c0bce763b5f219fcb459cc4ca00963e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 May 2020 14:59:52 +0000 Subject: [PATCH 118/525] Bot Updating Templated Files --- Jenkinsfile | 53 +++++++++++++++++------------------------------------ README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 82c944c..a0a1a01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -140,7 +140,6 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -161,7 +160,6 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -182,7 +180,6 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -547,22 +544,15 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development docker push ${PUSHIMAGE}:development @@ -571,7 +561,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:development || : @@ -593,18 +583,11 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin @@ -638,26 +621,24 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:development - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-development - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-development - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:development - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-development - docker push ${LEGACYIMAGE}:arm64v8-development - done + docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:development + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-development + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-development + docker push ${GITHUBIMAGE}:amd64-${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker push ${GITHUBIMAGE}:development + docker push ${GITHUBIMAGE}:${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-development + docker push ${GITHUBIMAGE}:arm64v8-development ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-development \ diff --git a/README.md b/README.md index 1f8cab0..e1f0c96 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") -[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") -[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: @@ -25,16 +25,15 @@ Find us at: # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bazarr/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-bazarr/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bazarr) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bazarr) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bazarr) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) -[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-bazarr/container_registry) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fbazarr%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. @@ -124,7 +123,7 @@ Container images are configured using parameters passed at runtime (such as thos ## Environment variables from files (Docker secrets) -You can set any environment variable from a file by using a special prepend `FILE__`. +You can set any environment variable from a file by using a special prepend `FILE__`. As an example: @@ -134,6 +133,11 @@ As an example: Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +## Umask for running applications + +For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting. +Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support. + ## User / Group Identifiers When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. @@ -156,7 +160,7 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. From 24559ab1ab0677e6f21cc11203b2a859f15d214d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 May 2020 17:17:07 +0200 Subject: [PATCH 119/525] Bot Updating Package Versions --- package_versions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 004b6c8..f91c397 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,10 +31,12 @@ libffi-3.2.1-r6 libgcc-9.2.0-r4 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 +libintl-0.20.1-r2 libjpeg-turbo-2.0.4-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 +libproc-3.3.16-r0 libssl1.1-1.1.1g-r0 libstdc++-9.2.0-r4 libtasn1-4.15.0-r0 @@ -63,6 +65,7 @@ nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 opus-1.3.1-r0 p11-kit-0.23.18.1-r0 +procps-3.3.16-r0 python3-3.8.2-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 From 54d4411f3c60eb9911df71a3e16ef81f3d6887da Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 1 Jun 2020 18:11:47 -0500 Subject: [PATCH 120/525] Rebasing to alpine 3.12. --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92a3845..af2e8c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.11 +FROM lsiobase/alpine:3.12 # set version label ARG BUILD_DATE @@ -16,6 +16,7 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ + py3-pip \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index df9959d..543033e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.11 +FROM lsiobase/alpine:arm64v8-3.12 # set version label ARG BUILD_DATE @@ -16,6 +16,7 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ + py3-pip \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f57d586..e1b3a5e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.11 +FROM lsiobase/alpine:arm32v7-3.12 # set version label ARG BUILD_DATE @@ -16,6 +16,7 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ + py3-pip \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/README.md b/README.md index e1f0c96..0a759ea 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.12.19:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/readme-vars.yml b/readme-vars.yml index edd5c84..518ee89 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } From e5a10ac1f01fbb4515ae6006a09aecfbe1c8d9a4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 18:00:19 +0000 Subject: [PATCH 121/525] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1f0c96..edd14ce 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fbazarr%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. From ef0135769803c552e75849b21af59098c34fcf43 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 18:18:06 +0000 Subject: [PATCH 122/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f91c397..cff9e00 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,8 +4,8 @@ alsa-lib-1.2.1.2-r0 apk-tools-2.10.5-r0 bash-5.0.11-r1 busybox-1.31.1-r9 -ca-certificates-20191127-r1 -ca-certificates-cacert-20191127-r1 +ca-certificates-20191127-r2 +ca-certificates-cacert-20191127-r2 coreutils-8.31-r0 curl-7.67.0-r0 expat-2.2.9-r1 From 924ba0ef41d456ec35731a95115d2587611bc2a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Jun 2020 17:03:38 +0000 Subject: [PATCH 123/525] Bot Updating Package Versions --- package_versions.txt | 116 ++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cff9e00..08ff4c2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,86 +1,90 @@ -alpine-baselayout-3.2.0-r3 -alpine-keys-2.1-r2 -alsa-lib-1.2.1.2-r0 -apk-tools-2.10.5-r0 -bash-5.0.11-r1 -busybox-1.31.1-r9 +alpine-baselayout-3.2.0-r7 +alpine-keys-2.2-r0 +alsa-lib-1.2.2-r0 +aom-libs-1.0.0-r1 +apk-tools-2.10.5-r1 +bash-5.0.17-r0 +brotli-libs-1.0.7-r5 +busybox-1.31.1-r16 ca-certificates-20191127-r2 -ca-certificates-cacert-20191127-r2 -coreutils-8.31-r0 -curl-7.67.0-r0 +ca-certificates-bundle-20191127-r2 +coreutils-8.32-r0 +curl-7.69.1-r0 expat-2.2.9-r1 -ffmpeg-4.2.1-r3 -ffmpeg-libs-4.2.1-r3 +ffmpeg-4.2.3-r0 +ffmpeg-libs-4.2.3-r0 fontconfig-2.13.1-r2 -freetype-2.10.1-r0 -fribidi-1.0.8-r0 +freetype-2.10.2-r0 +fribidi-1.0.9-r0 gdbm-1.13-r1 -gmp-6.1.2-r1 -gnutls-3.6.10-r1 +gmp-6.2.0-r0 +gnutls-3.6.14-r0 lame-3.100-r0 libacl-2.2.53-r0 libass-0.14.0-r0 libattr-2.4.48-r0 libbsd-0.10.0-r0 libbz2-1.0.8-r1 -libc-utils-0.7.2-r0 +libc-utils-0.7.2-r3 libcrypto1.1-1.1.1g-r0 -libcurl-7.67.0-r0 -libdrm-2.4.100-r0 -libffi-3.2.1-r6 -libgcc-9.2.0-r4 +libcurl-7.69.1-r0 +libdav1d-0.7.0-r0 +libdrm-2.4.102-r0 +libffi-3.3-r2 +libgcc-9.3.0-r2 libgcrypt-1.8.5-r0 -libgpg-error-1.36-r2 -libintl-0.20.1-r2 -libjpeg-turbo-2.0.4-r0 +libgpg-error-1.37-r0 +libintl-0.20.2-r0 +libjpeg-turbo-2.0.4-r1 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 +libssh-0.9.4-r0 libssl1.1-1.1.1g-r0 -libstdc++-9.2.0-r4 -libtasn1-4.15.0-r0 +libstdc++-9.3.0-r2 +libtasn1-4.16.0-r1 libtheora-1.1.1-r14 -libtls-standalone-2.9.1-r0 +libtls-standalone-2.9.1-r1 libunistring-0.9.10-r0 -libuuid-2.34-r1 -libva-2.6.0-r0 -libvdpau-1.3-r0 +libuuid-2.35.2-r0 +libva-2.7.1-r0 +libvdpau-1.4-r0 libvorbis-1.3.6-r2 -libvpx-1.8.1-r0 +libvpx-1.8.2-r0 libx11-1.6.9-r0 libxau-1.0.9-r0 -libxcb-1.13.1-r0 +libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r3 +libxml2-2.9.10-r4 libxslt-1.1.34-r0 -linux-pam-1.3.1-r1 -musl-1.1.24-r2 -musl-utils-1.1.24-r2 -ncurses-libs-6.1_p20200118-r4 -ncurses-terminfo-base-6.1_p20200118-r4 -nettle-3.5.1-r0 -nghttp2-libs-1.40.0-r0 +linux-pam-1.3.1-r4 +musl-1.1.24-r8 +musl-utils-1.1.24-r8 +ncurses-libs-6.2_p20200523-r0 +ncurses-terminfo-base-6.2_p20200523-r0 +nettle-3.5.1-r1 +nghttp2-libs-1.41.0-r0 opus-1.3.1-r0 -p11-kit-0.23.18.1-r0 +p11-kit-0.23.20-r5 procps-3.3.16-r0 -python3-3.8.2-r0 -readline-8.0.1-r0 -scanelf-1.2.4-r0 -sdl2-2.0.10-r0 -shadow-4.7-r1 -sqlite-libs-3.30.1-r2 -ssl_client-1.31.1-r9 +python3-3.8.3-r0 +readline-8.0.4-r0 +scanelf-1.2.6-r0 +sdl2-2.0.12-r1 +shadow-4.8.1-r0 +sqlite-libs-3.32.1-r0 +ssl_client-1.31.1-r16 tzdata-2020a-r0 -unrar-5.8.5-r0 -unzip-6.0-r6 -v4l-utils-libs-1.18.0-r0 -wayland-libs-client-1.17.0-r0 -x264-libs-20191119-r0 -x265-libs-3.2.1-r0 -xvidcore-1.3.5-r0 -xz-5.2.4-r0 -xz-libs-5.2.4-r0 +unrar-5.9.2-r0 +unzip-6.0-r7 +v4l-utils-libs-1.20.0-r0 +wayland-libs-client-1.18.0-r4 +x264-libs-20191119-r1 +x265-libs-3.3-r1 +xvidcore-1.3.7-r1 +xz-5.2.5-r0 +xz-libs-5.2.5-r0 zlib-1.2.11-r3 From bfa64f708b9719b502ccfb5bfc9229c024cd36d4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Jun 2020 23:25:23 -0400 Subject: [PATCH 124/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 08ff4c2..67cd85e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,8 +6,8 @@ apk-tools-2.10.5-r1 bash-5.0.17-r0 brotli-libs-1.0.7-r5 busybox-1.31.1-r16 -ca-certificates-20191127-r2 -ca-certificates-bundle-20191127-r2 +ca-certificates-20191127-r3 +ca-certificates-bundle-20191127-r3 coreutils-8.32-r0 curl-7.69.1-r0 expat-2.2.9-r1 From 29f83e5fbce818bf9804426afaabf3b41933d347 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Jun 2020 09:19:43 +0000 Subject: [PATCH 125/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 67cd85e..a9c468c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,14 +5,14 @@ aom-libs-1.0.0-r1 apk-tools-2.10.5-r1 bash-5.0.17-r0 brotli-libs-1.0.7-r5 -busybox-1.31.1-r16 +busybox-1.31.1-r19 ca-certificates-20191127-r3 ca-certificates-bundle-20191127-r3 coreutils-8.32-r0 curl-7.69.1-r0 expat-2.2.9-r1 -ffmpeg-4.2.3-r0 -ffmpeg-libs-4.2.3-r0 +ffmpeg-4.3-r0 +ffmpeg-libs-4.3-r0 fontconfig-2.13.1-r2 freetype-2.10.2-r0 fribidi-1.0.9-r0 @@ -76,7 +76,7 @@ scanelf-1.2.6-r0 sdl2-2.0.12-r1 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r16 +ssl_client-1.31.1-r19 tzdata-2020a-r0 unrar-5.9.2-r0 unzip-6.0-r7 From 3b3ad5d2c13015e0f043b4e7cae7075efc061a6c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 20 Jun 2020 16:54:05 +0000 Subject: [PATCH 126/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a9c468c..25e6173 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ libxfixes-5.0.3-r2 libxml2-2.9.10-r4 libxslt-1.1.34-r0 linux-pam-1.3.1-r4 -musl-1.1.24-r8 +musl-1.1.24-r9 musl-utils-1.1.24-r8 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 From 54bc24ff1e58e911bf845984994e327e926d68f6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Jun 2020 11:55:07 +0000 Subject: [PATCH 127/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 25e6173..f993d00 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,8 +6,8 @@ apk-tools-2.10.5-r1 bash-5.0.17-r0 brotli-libs-1.0.7-r5 busybox-1.31.1-r19 -ca-certificates-20191127-r3 -ca-certificates-bundle-20191127-r3 +ca-certificates-20191127-r4 +ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 curl-7.69.1-r0 expat-2.2.9-r1 @@ -35,7 +35,7 @@ libgcc-9.3.0-r2 libgcrypt-1.8.5-r0 libgpg-error-1.37-r0 libintl-0.20.2-r0 -libjpeg-turbo-2.0.4-r1 +libjpeg-turbo-2.0.5-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 @@ -62,7 +62,7 @@ libxml2-2.9.10-r4 libxslt-1.1.34-r0 linux-pam-1.3.1-r4 musl-1.1.24-r9 -musl-utils-1.1.24-r8 +musl-utils-1.1.24-r9 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nettle-3.5.1-r1 From c4e8bb2c865d59104df973770779ac8c10572dda Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 13 Jul 2020 11:55:11 -0400 Subject: [PATCH 128/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f993d00..f269168 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,8 +11,8 @@ ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 curl-7.69.1-r0 expat-2.2.9-r1 -ffmpeg-4.3-r0 -ffmpeg-libs-4.3-r0 +ffmpeg-4.3.1-r0 +ffmpeg-libs-4.3.1-r0 fontconfig-2.13.1-r2 freetype-2.10.2-r0 fribidi-1.0.9-r0 From 4fb4c69c6ebdcff9fb1904835e95a184255151f0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Jul 2020 21:15:19 +0000 Subject: [PATCH 129/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f269168..b6ba012 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,7 +70,7 @@ nghttp2-libs-1.41.0-r0 opus-1.3.1-r0 p11-kit-0.23.20-r5 procps-3.3.16-r0 -python3-3.8.3-r0 +python3-3.8.4-r0 readline-8.0.4-r0 scanelf-1.2.6-r0 sdl2-2.0.12-r1 From ea0c1bb04541e027b24375bdf8e4d3b20d5fa763 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Jul 2020 05:55:23 +0000 Subject: [PATCH 130/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b6ba012..bc374ac 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,7 +70,7 @@ nghttp2-libs-1.41.0-r0 opus-1.3.1-r0 p11-kit-0.23.20-r5 procps-3.3.16-r0 -python3-3.8.4-r0 +python3-3.8.5-r0 readline-8.0.4-r0 scanelf-1.2.6-r0 sdl2-2.0.12-r1 From f002218275f6cc3d0e0f652dcc64e6f548a8fbec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 1 Aug 2020 15:22:06 +0000 Subject: [PATCH 131/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bc374ac..7422df4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libva-2.7.1-r0 libvdpau-1.4-r0 libvorbis-1.3.6-r2 libvpx-1.8.2-r0 -libx11-1.6.9-r0 +libx11-1.6.10-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 From 91ba8391e265913ba76a33bbb315a58795b18fa4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Aug 2020 15:00:13 +0000 Subject: [PATCH 132/525] Bot Updating Templated Files --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0a1a01..711430b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,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 ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -246,7 +246,7 @@ pipeline { cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f development cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} @@ -700,6 +700,10 @@ pipeline { ] ]) { sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ @@ -707,7 +711,9 @@ pipeline { -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ - lsiodev/readme-sync bash -c 'node sync' ''' + -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ + lsiodev/readme-sync bash -c 'node sync' + rm -Rf ${TEMPDIR} ''' } } } From 3b1d030995b8690180279a43d574ecf72b712ca0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Aug 2020 15:01:28 +0000 Subject: [PATCH 133/525] Bot Updating Templated Files --- .github/workflows/greetings.yml | 13 +++++++++++++ .github/workflows/stale.yml | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 .github/workflows/greetings.yml create mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml new file mode 100755 index 0000000..11b1813 --- /dev/null +++ b/.github/workflows/greetings.yml @@ -0,0 +1,13 @@ +name: Greetings + +on: [pull_request, issues] + +jobs: + greeting: + runs-on: ubuntu-latest + steps: + - uses: actions/first-interaction@v1 + with: + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bazarr/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/.github/PULL_REQUEST_TEMPLATE.md)!' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100755 index 0000000..1806420 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,23 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + with: + stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 30 + days-before-close: 365 + exempt-issue-labels: 'awaiting-approval,work-in-progress' + exempt-pr-labels: 'awaiting-approval,work-in-progress' + repo-token: ${{ secrets.GITHUB_TOKEN }} From 7ef4b833a6d4c6dd066c7c4e233b4d6d099628c9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 8 Aug 2020 20:48:37 +0000 Subject: [PATCH 134/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7422df4..cdb85c3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libva-2.7.1-r0 libvdpau-1.4-r0 libvorbis-1.3.6-r2 libvpx-1.8.2-r0 -libx11-1.6.10-r0 +libx11-1.6.11-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 From 462e2ce6cfdf4631343f153eb696591ed59cc0e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Aug 2020 20:00:09 +0000 Subject: [PATCH 135/525] Bot Updating Templated Files --- .github/workflows/greetings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 11b1813..cb644e2 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -1,6 +1,6 @@ name: Greetings -on: [pull_request, issues] +on: [pull_request_target, issues] jobs: greeting: From 0336adbb1b7e0c48a587c2e02d4be2614649aa94 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Aug 2020 13:35:37 -0400 Subject: [PATCH 136/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cdb85c3..205238a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libva-2.7.1-r0 libvdpau-1.4-r0 libvorbis-1.3.6-r2 libvpx-1.8.2-r0 -libx11-1.6.11-r0 +libx11-1.6.12-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 From 2dfd4386f24453737d49646e7ab8132f7b35d55a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Sep 2020 16:48:01 -0400 Subject: [PATCH 137/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 205238a..10f63a6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ freetype-2.10.2-r0 fribidi-1.0.9-r0 gdbm-1.13-r1 gmp-6.2.0-r0 -gnutls-3.6.14-r0 +gnutls-3.6.15-r0 lame-3.100-r0 libacl-2.2.53-r0 libass-0.14.0-r0 From 45fc54f2c9df3630f09c581ea8193459b95bebe1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Sep 2020 11:54:48 -0400 Subject: [PATCH 138/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 10f63a6..ad0cd12 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 -libssh-0.9.4-r0 +libssh-0.9.4-r1 libssl1.1-1.1.1g-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 From de4ebb249f78a9dce180e74766d42c730a4904f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Sep 2020 03:55:29 +0000 Subject: [PATCH 139/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ad0cd12..a38dfdc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r0 +curl-7.69.1-r1 expat-2.2.9-r1 ffmpeg-4.3.1-r0 ffmpeg-libs-4.3.1-r0 @@ -27,7 +27,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r0 +libcurl-7.69.1-r1 libdav1d-0.7.0-r0 libdrm-2.4.102-r0 libffi-3.3-r2 From f7193a5bd1aff175f7fa0517b58d5e07ba5a097b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Sep 2020 16:27:50 +0000 Subject: [PATCH 140/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a38dfdc..4d38026 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -58,7 +58,7 @@ libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r4 +libxml2-2.9.10-r5 libxslt-1.1.34-r0 linux-pam-1.3.1-r4 musl-1.1.24-r9 From 1ede1ee2ded160aab1f8d0d973a6ba77e44b19e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 26 Sep 2020 20:48:35 +0000 Subject: [PATCH 141/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4d38026..5d1c2c0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tzdata-2020a-r0 unrar-5.9.2-r0 -unzip-6.0-r7 +unzip-6.0-r8 v4l-utils-libs-1.20.0-r0 wayland-libs-client-1.18.0-r4 x264-libs-20191119-r1 From 5f4d302c9362882a521a0bebb57516327fad97e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Oct 2020 22:00:10 +0100 Subject: [PATCH 142/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 12 +++-- .github/PULL_REQUEST_TEMPLATE.md | 10 ++-- .github/workflows/greetings.yml | 4 +- Jenkinsfile | 28 ++++++++++- README.md | 82 +++++++++++++++++--------------- 5 files changed, 86 insertions(+), 50 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4b22972..76654db 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,10 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] -If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. + + + + @@ -22,9 +25,10 @@ If you are new to Docker or this application our issue tracker is **ONLY** used 4. ## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + ## Command used to create docker container (run/create/compose/screenshot) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 26d5031..422815d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,11 +2,11 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - + - + @@ -21,7 +21,11 @@ ------------------------------ -We welcome all PR’s though this doesn’t guarantee it will be accepted. + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-bazarr/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + +------------------------------ + + ## Description: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index cb644e2..629f184 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 [issue template](https://github.com/linuxserver/docker-bazarr/.github/ISSUE_TEMPLATE.md)!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bazarr/blob/master/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index 711430b..84b35de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,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 ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -148,6 +148,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } } } @@ -168,6 +169,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -188,6 +190,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -555,8 +558,10 @@ pipeline { for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} docker push ${PUSHIMAGE}:development docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} done ''' } @@ -564,6 +569,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:development || : done ''' @@ -604,12 +610,18 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-development docker push ${MANIFESTIMAGE}:arm32v7-development docker push ${MANIFESTIMAGE}:arm64v8-development + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest push --purge ${MANIFESTIMAGE}:development || : docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm @@ -618,8 +630,12 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} @@ -628,6 +644,10 @@ pipeline { docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-development docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-development + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} @@ -635,6 +655,10 @@ pipeline { docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-development docker push ${GITHUBIMAGE}:arm64v8-development + docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -703,7 +727,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ diff --git a/README.md b/README.md index ae5438b..4ca37d2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -58,34 +61,11 @@ The architectures supported by this image are: Here are some example snippets to help you get started creating a container. -### docker - -``` -docker create \ - --name=bazarr \ - -e PUID=1000 \ - -e PGID=1000 \ - -e TZ=Europe/London \ - -e UMASK_SET=022 `#optional` \ - -p 6767:6767 \ - -v :/config \ - -v :/movies \ - -v :/config \ + -v :/movies \ + -v :` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -160,9 +163,9 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=bazarr&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") -We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. ## Support Info @@ -180,14 +183,6 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: -### Via Docker Run/Create -* Update the image: `docker pull linuxserver/bazarr` -* Stop the running container: `docker stop bazarr` -* Delete the container: `docker rm bazarr` -* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* Start the new container: `docker start bazarr` -* You can also remove the old dangling images: `docker image prune` - ### Via Docker Compose * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull bazarr` @@ -195,7 +190,14 @@ Below are the instructions for updating containers: * or update a single container: `docker-compose up -d bazarr` * You can also remove the old dangling images: `docker image prune` -### Via Watchtower auto-updater (especially useful if you don't remember the original parameters) +### Via Docker Run +* Update the image: `docker pull linuxserver/bazarr` +* Stop the running container: `docker stop bazarr` +* Delete the container: `docker rm bazarr` +* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* You can also remove the old dangling images: `docker image prune` + +### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: ``` docker run --rm \ @@ -203,11 +205,13 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once bazarr ``` - -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. - * You can also remove the old dangling images: `docker image prune` +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). + +### Image Update Notifications - Diun (Docker Image Update Notifier) +* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. + ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: From 60982ef355d380e5e9000fde1f0cdc47f4a6933b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Oct 2020 21:01:42 +0000 Subject: [PATCH 143/525] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 122 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100755 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100755 index 0000000..4e69847 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,122 @@ +# Contributing to bazarr + +## Gotchas + +* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. +* Read, and fill the Pull Request template + * If this is a fix for a typo in code or documentation in the README please file an issue + * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) + +## Common files + +| File | Use case | +| :----: | --- | +| `Dockerfile` | Dockerfile used to build amd64 images | +| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | +| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | +| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | +| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | +| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | +| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | +| `readme-vars.yml` | This file is used to generate the `README.md` | + +## Readme + +If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-bazarr/edit/master/readme-vars.yml). + +These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. +Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-bazarr) + +### Fixing typos or clarify the text in the readme + +There are variables for multiple parts of the readme, the most common ones are: + +| Variable | Description | +| :----: | --- | +| `project_blurb` | This is the short excerpt shown above the project logo. | +| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | + +### Parameters + +The compose and run examples are also generated from these variables. + +We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. + +These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. +Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. + +Devices, environment variables, ports and volumes expects its variables in a certain way. + +### Devices + +```yml +param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +opt_param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +``` + +### Environment variables + +```yml +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +opt_param_env_vars: + - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } +``` + +### Ports + +```yml +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +opt_param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +``` + +### Volumes + +```yml +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +opt_param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +``` + +### Testing template changes + +After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. + +## Dockerfiles + +We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. +If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. + +### Testing your changes + +``` +git clone https://github.com/linuxserver/docker-bazarr.git +cd docker-bazarr +docker build \ + --no-cache \ + --pull \ + -t linuxserver/bazarr:latest . +``` + +The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +``` +docker run --rm --privileged multiarch/qemu-user-static:register --reset +``` + +Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. + +## Update the chagelog + +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bazarr/tree/master/root), add an entry to the changelog + +```yml +changelogs: + - { date: "DD.MM.YY:", desc: "Added some love to templates" } +``` From 46496e30bb5be32945f9a7cad49c918e96d339b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 7 Oct 2020 03:56:30 +0000 Subject: [PATCH 144/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5d1c2c0..d92567c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alsa-lib-1.2.2-r0 aom-libs-1.0.0-r1 apk-tools-2.10.5-r1 bash-5.0.17-r0 -brotli-libs-1.0.7-r5 +brotli-libs-1.0.9-r1 busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 From c47b8eb4d25340fe87f380d96258843c57e2f5a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 24 Oct 2020 16:48:30 -0400 Subject: [PATCH 145/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d92567c..0aea0a3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ expat-2.2.9-r1 ffmpeg-4.3.1-r0 ffmpeg-libs-4.3.1-r0 fontconfig-2.13.1-r2 -freetype-2.10.2-r0 +freetype-2.10.4-r0 fribidi-1.0.9-r0 gdbm-1.13-r1 gmp-6.2.0-r0 From 8f4a3f74571dc61f547c581a90e43e2f2fcd5dad Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 2 Nov 2020 07:06:59 -0800 Subject: [PATCH 146/525] update baseimages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index af2e8c9..1e82e07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 543033e..1ba43a1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e1b3a5e..aee2aa9 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 # set version label ARG BUILD_DATE From 0b7b34283f449b5a72b9080cc14b1fc79bd3ad24 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 15:12:14 +0000 Subject: [PATCH 147/525] Bot Updating Templated Files --- Jenkinsfile | 162 ++++++++++++++++++++-------------------------------- README.md | 14 ++--- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 84b35de..05d9d2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,7 +46,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -140,7 +140,7 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER @@ -161,7 +161,7 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA @@ -182,7 +182,7 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST @@ -203,24 +203,24 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') ]) { script{ - env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash set -e - docker pull lsiodev/spaces-file-upload:latest + docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ -e FILE_NAME="shellcheck-result.xml" \ -e MIMETYPE="text/xml" \ -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ - -t lsiodev/spaces-file-upload:latest \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ python /upload.py''' } } @@ -238,8 +238,8 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -344,28 +344,19 @@ pipeline { label 'ARMHF' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm32v7-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } stage('Build ARM64') { @@ -373,28 +364,19 @@ pipeline { label 'ARM64' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -493,20 +475,20 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') ]) { script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' } sh '''#! /bin/bash set -e - docker pull lsiodev/ci:latest + docker pull ghcr.io/linuxserver/lsiodev-ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ --shm-size=1gb \ @@ -518,15 +500,15 @@ pipeline { -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t lsiodev/ci:latest \ + -t ghcr.io/linuxserver/lsiodev-ci:latest \ python /ci/ci.py''' } } @@ -553,7 +535,7 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} @@ -595,15 +577,15 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; 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} @@ -637,28 +619,6 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done - docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:development - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-development - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-development - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker push ${GITHUBIMAGE}:development - docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-development - docker push ${GITHUBIMAGE}:arm64v8-development - docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -672,8 +632,8 @@ pipeline { ${DELETEIMAGE}:arm64v8-development || : done docker rmi \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : ''' } } @@ -726,9 +686,9 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull lsiodev/readme-sync + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/lsiodev-readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -736,7 +696,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - lsiodev/readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 4ca37d2..22cc677 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bazarr/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. @@ -46,7 +46,7 @@ Find us at: Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `ghcr.io/linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -70,7 +70,7 @@ Compatible with docker-compose v2 schemas. version: "2.1" services: bazarr: - image: linuxserver/bazarr + image: ghcr.io/linuxserver/bazarr container_name: bazarr environment: - PUID=1000 @@ -100,7 +100,7 @@ docker run -d \ -v :/movies \ -v Date: Mon, 2 Nov 2020 15:42:44 +0000 Subject: [PATCH 148/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0aea0a3..cf9e4bd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ sdl2-2.0.12-r1 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 -tzdata-2020a-r0 +tzdata-2020c-r0 unrar-5.9.2-r0 unzip-6.0-r8 v4l-utils-libs-1.20.0-r0 From 6db55a8c0564b58adad295374e78ceae546530c1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 Nov 2020 19:06:28 -0500 Subject: [PATCH 149/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cf9e4bd..e5e8dce 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ libxfixes-5.0.3-r2 libxml2-2.9.10-r5 libxslt-1.1.34-r0 linux-pam-1.3.1-r4 -musl-1.1.24-r9 +musl-1.1.24-r10 musl-utils-1.1.24-r9 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 From 6b377827f44069e67407431e1607a5b348b83c39 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 28 Nov 2020 21:50:27 +0000 Subject: [PATCH 150/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e5e8dce..2167669 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -62,7 +62,7 @@ libxml2-2.9.10-r5 libxslt-1.1.34-r0 linux-pam-1.3.1-r4 musl-1.1.24-r10 -musl-utils-1.1.24-r9 +musl-utils-1.1.24-r10 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nettle-3.5.1-r1 @@ -77,7 +77,7 @@ sdl2-2.0.12-r1 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 -tzdata-2020c-r0 +tzdata-2020c-r1 unrar-5.9.2-r0 unzip-6.0-r8 v4l-utils-libs-1.20.0-r0 From b9c5ec4b1eb9e44515a8b45b6b142881caf22e68 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Dec 2020 13:57:37 +0000 Subject: [PATCH 151/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2167669..a6bfd60 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r1 +curl-7.69.1-r2 expat-2.2.9-r1 ffmpeg-4.3.1-r0 ffmpeg-libs-4.3.1-r0 @@ -27,7 +27,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r1 +libcurl-7.69.1-r2 libdav1d-0.7.0-r0 libdrm-2.4.102-r0 libffi-3.3-r2 From 63a03638b4d2685ca35b315721012ba7fdf3cffa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Dec 2020 21:55:41 +0000 Subject: [PATCH 152/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a6bfd60..6db521d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r2 +curl-7.69.1-r3 expat-2.2.9-r1 ffmpeg-4.3.1-r0 ffmpeg-libs-4.3.1-r0 @@ -26,8 +26,8 @@ libattr-2.4.48-r0 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r2 +libcrypto1.1-1.1.1i-r0 +libcurl-7.69.1-r3 libdav1d-0.7.0-r0 libdrm-2.4.102-r0 libffi-3.3-r2 @@ -41,7 +41,7 @@ libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 libssh-0.9.4-r1 -libssl1.1-1.1.1g-r0 +libssl1.1-1.1.1i-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 libtheora-1.1.1-r14 From 3e60024e8dc057c1311679090bf65b486bb96899 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Dec 2020 17:00:25 +0000 Subject: [PATCH 153/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6db521d..a41d666 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -68,7 +68,7 @@ ncurses-terminfo-base-6.2_p20200523-r0 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 opus-1.3.1-r0 -p11-kit-0.23.20-r5 +p11-kit-0.23.22-r0 procps-3.3.16-r0 python3-3.8.5-r0 readline-8.0.4-r0 From 14f0070f17b57b68c4700638fe68ea84f3970994 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 14:33:03 -0500 Subject: [PATCH 154/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 --------------------------- Jenkinsfile | 54 ++++++++++++++++++++++++--------------- README.md | 2 +- 3 files changed, 35 insertions(+), 58 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 76654db..8b13789 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,38 +1 @@ -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/Jenkinsfile b/Jenkinsfile index 05d9d2b..0609324 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -143,12 +143,13 @@ pipeline { env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } - env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN } } } @@ -164,12 +165,13 @@ pipeline { env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -185,12 +187,13 @@ pipeline { env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -250,9 +253,12 @@ pipeline { git checkout -f development cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md 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} @@ -322,8 +328,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -335,8 +342,9 @@ pipeline { parallel { stage('Build X86') { steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -344,12 +352,13 @@ pipeline { label 'ARMHF' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -364,12 +373,13 @@ pipeline { label 'ARM64' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -612,6 +622,7 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 @@ -626,10 +637,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-development \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-development \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-development || : + ${DELETEIMAGE}:arm64v8-development \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -696,7 +710,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 22cc677..024e106 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-bazarr/container_registry) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bazarr/container_registry) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) From d966e37a0d09e42fe1e81a83824a4d0e4169a330 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 14:34:29 -0500 Subject: [PATCH 155/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/config.yml | 13 +++ .github/ISSUE_TEMPLATE/issue.bug.md | 40 +++++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 25 ++++++ .github/workflows/external_trigger.yml | 90 +++++++++++++++++++ .../workflows/external_trigger_scheduler.yml | 43 +++++++++ .github/workflows/package_trigger.yml | 38 ++++++++ .../workflows/package_trigger_scheduler.yml | 50 +++++++++++ 8 files changed, 299 insertions(+), 1 deletion(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100755 .github/ISSUE_TEMPLATE/config.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md create mode 100755 .github/workflows/external_trigger.yml create mode 100755 .github/workflows/external_trigger_scheduler.yml create mode 100755 .github/workflows/package_trigger.yml create mode 100755 .github/workflows/package_trigger_scheduler.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8b13789..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100755 index 0000000..6ba8f84 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-bazarr + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100755 index 0000000..48aa3a0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + +------------------------------ + +## Expected Behavior + + +## Current Behavior + + +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md new file mode 100755 index 0000000..20a91fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + +------------------------------ + +## Desired Behavior + + +## Current Behavior + + +## Alternatives Considered + diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100755 index 0000000..109a2f1 --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,90 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-development: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/development' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/commits/development" | jq -r '. | .sha' | cut -c1-8) + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for bazarr branch development" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/bazarr" + tag="development" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbazarr%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') + IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') + if [ -z "${IMAGE_VERSION}" ]; then + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for bazarr tag development" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for bazarr tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100755 index 0000000..2d820d1 --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '50 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml new file mode 100755 index 0000000..2f0261b --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-development: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/development' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi + echo "**** Package trigger running off of development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100755 index 0000000..04fdf6c --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,50 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '31 3 * * 3' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for bazarr** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bazarr/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} From e41cb962028541801ffefa2bd6c3be4d6e17741b Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 15 Dec 2020 18:52:34 -0600 Subject: [PATCH 156/525] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0609324..b11d232 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -254,11 +254,11 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md + git rm .github/ISSUE_TEMPLATE.md || : 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} From b0afb492fd48bdbb396e221afd76cd7d8ec485b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 19:53:50 -0500 Subject: [PATCH 157/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 1 + Jenkinsfile | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 109a2f1..9ccd683 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -27,6 +27,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" echo "**** Retrieving last pushed version ****" image="linuxserver/bazarr" diff --git a/Jenkinsfile b/Jenkinsfile index b11d232..f739807 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -452,6 +452,13 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -469,6 +476,13 @@ pipeline { } } steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -558,7 +572,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ From c341aa8b520f21ae7ebcde40138a9a181adb745b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 04:25:43 +0000 Subject: [PATCH 158/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a41d666..cfa7528 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ sdl2-2.0.12-r1 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 -tzdata-2020c-r1 +tzdata-2020f-r0 unrar-5.9.2-r0 unzip-6.0-r8 v4l-utils-libs-1.20.0-r0 From 5889e98efdb73db873c464ea2eb01b25c861fa2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 23:15:29 -0500 Subject: [PATCH 159/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 3 ++- .github/workflows/greetings.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- Jenkinsfile | 19 ++++++++++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9ccd683..1d3b0d2 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -22,8 +22,9 @@ jobs: if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for bazarr branch development" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-bazarr/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 629f184..d044e7d 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 [issue template](https://github.com/linuxserver/docker-bazarr/blob/master/.github/ISSUE_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bazarr/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bazarr/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 04fdf6c..1ae3810 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '31 3 * * 3' + - cron: '13 4 * * 0' workflow_dispatch: jobs: diff --git a/Jenkinsfile b/Jenkinsfile index f739807..019db3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -267,13 +267,30 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + fi + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( From 04c10ca646654b7409bc0117086464a4e76e112e Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sat, 23 Jan 2021 13:46:54 +0100 Subject: [PATCH 160/525] Deprecate UMASK_SET in favor of UMASK in baseimage --- README.md | 4 +--- readme-vars.yml | 5 ++--- root/etc/services.d/bazarr/run | 6 ++++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 024e106..e92fe25 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,6 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/London - - UMASK_SET=022 #optional volumes: - :/config - :/movies @@ -94,7 +93,6 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ - -e UMASK_SET=022 `#optional` \ -p 6767:6767 \ -v :/config \ -v :/movies \ @@ -119,7 +117,6 @@ Container images are configured using parameters passed at runtime (such as thos | `-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 UMASK_SET=022` | control permissions of files and directories created by Bazarr | | `-v /config` | Bazarr data | | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | @@ -233,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **19.12.19:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. diff --git a/readme-vars.yml b/readme-vars.yml index 518ee89..ac43689 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,9 +36,7 @@ param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} # optional env variables -opt_param_usage_include_env: true -opt_param_env_vars: - - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Bazarr"} +opt_param_usage_include_env: false # application setup block app_setup_block_enabled: true @@ -48,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run index 7057794..36c6402 100644 --- a/root/etc/services.d/bazarr/run +++ b/root/etc/services.d/bazarr/run @@ -1,7 +1,9 @@ #!/usr/bin/with-contenv bash -UMASK_SET=${UMASK_SET:-022} -umask "$UMASK_SET" +if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then + echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" + umask ${UMASK_SET} +fi exec \ s6-setuidgid abc python3 /app/bazarr/bazarr.py \ From a379e1cb61307a542383d342de51028f58fd2f3e Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Jan 2021 12:10:47 -0800 Subject: [PATCH 161/525] Rebasing to Alpine 3.13 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e82e07..4784baa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1ba43a1..5df045d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index aee2aa9..1e48225 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 518ee89..e6ea9b5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } From dfc196a755e7cbc20b8a4b34258a08f420bf09b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Feb 2021 15:52:37 +0000 Subject: [PATCH 162/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cfa7528..cba36d0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ sdl2-2.0.12-r1 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 -tzdata-2020f-r0 +tzdata-2021a-r0 unrar-5.9.2-r0 unzip-6.0-r8 v4l-utils-libs-1.20.0-r0 From dc613d3982e211a7ee4805a9c8e06af2abe984ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 11:43:04 -0500 Subject: [PATCH 163/525] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- README.md | 1 + 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 019db3c..d85c286 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -243,10 +243,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + 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} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + 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} + echo "Deleting old templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} @@ -254,11 +297,13 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${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 rm .github/ISSUE_TEMPLATE.md || : 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} @@ -267,8 +312,8 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' @@ -278,13 +323,13 @@ pipeline { git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, skipping Unraid template upload" else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' @@ -524,7 +569,7 @@ pipeline { } sh '''#! /bin/bash set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest + docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; 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} @@ -549,7 +594,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ + -t ghcr.io/linuxserver/ci:latest \ python /ci/ci.py''' } } @@ -694,9 +739,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${META_TAG}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\ "type": "commit",\ @@ -704,9 +749,9 @@ pipeline { echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "development",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done @@ -733,7 +778,7 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/lsiodev-readme-sync + docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -741,7 +786,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index e92fe25..9c5f29b 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.01.21:** - Rebasing to alpine 3.13. * **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **19.12.19:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to container log. From c0e734faeacf9a444b3bc156d0b77df42f0bd2a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 11:44:21 -0500 Subject: [PATCH 164/525] Bot Updating Templated Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96374c4..6e8ad97 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +.jenkins-external From a43c82e73acb10f7e2c2a0c607cb1dc90cddd9ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 17:44:56 +0000 Subject: [PATCH 165/525] Bot Updating Package Versions --- package_versions.txt | 122 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cba36d0..7efe8dd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,89 +1,103 @@ -alpine-baselayout-3.2.0-r7 +alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 -alsa-lib-1.2.2-r0 +alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 -apk-tools-2.10.5-r1 -bash-5.0.17-r0 -brotli-libs-1.0.9-r1 -busybox-1.31.1-r19 -ca-certificates-20191127-r4 -ca-certificates-bundle-20191127-r4 -coreutils-8.32-r0 -curl-7.69.1-r3 -expat-2.2.9-r1 -ffmpeg-4.3.1-r0 -ffmpeg-libs-4.3.1-r0 -fontconfig-2.13.1-r2 -freetype-2.10.4-r0 -fribidi-1.0.9-r0 -gdbm-1.13-r1 -gmp-6.2.0-r0 -gnutls-3.6.15-r0 +apk-tools-2.12.1-r0 +bash-5.1.0-r0 +brotli-libs-1.0.9-r3 +busybox-1.32.1-r2 +ca-certificates-20191127-r5 +ca-certificates-bundle-20191127-r5 +coreutils-8.32-r2 +curl-7.74.0-r0 +expat-2.2.10-r1 +ffmpeg-4.3.1-r3 +ffmpeg-libs-4.3.1-r3 +fontconfig-2.13.1-r3 +freetype-2.10.4-r1 +fribidi-1.0.10-r0 +gdbm-1.19-r0 +glib-2.66.7-r0 +gmp-6.2.1-r0 +gnutls-3.7.0-r0 +graphite2-1.3.14-r0 +harfbuzz-2.7.4-r1 lame-3.100-r0 libacl-2.2.53-r0 -libass-0.14.0-r0 +libass-0.15.0-r0 libattr-2.4.48-r0 +libblkid-2.36.1-r1 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1i-r0 -libcurl-7.69.1-r3 -libdav1d-0.7.0-r0 -libdrm-2.4.102-r0 +libcurl-7.74.0-r0 +libdav1d-0.8.1-r0 +libdrm-2.4.104-r0 libffi-3.3-r2 -libgcc-9.3.0-r2 -libgcrypt-1.8.5-r0 -libgpg-error-1.37-r0 -libintl-0.20.2-r0 -libjpeg-turbo-2.0.5-r0 +libgcc-10.2.1_pre1-r3 +libgcrypt-1.8.7-r0 +libgomp-10.2.1_pre1-r3 +libgpg-error-1.41-r0 +libintl-0.20.2-r2 +libjpeg-turbo-2.0.6-r0 +libmount-2.36.1-r1 libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 -libssh-0.9.4-r1 +libsrt-1.4.2-r0 +libssh-0.9.5-r0 libssl1.1-1.1.1i-r0 -libstdc++-9.3.0-r2 +libstdc++-10.2.1_pre1-r3 libtasn1-4.16.0-r1 -libtheora-1.1.1-r14 +libtheora-1.1.1-r16 libtls-standalone-2.9.1-r1 libunistring-0.9.10-r0 -libuuid-2.35.2-r0 -libva-2.7.1-r0 +libuuid-2.36.1-r1 +libva-2.10.0-r0 libvdpau-1.4-r0 -libvorbis-1.3.6-r2 -libvpx-1.8.2-r0 -libx11-1.6.12-r0 +libvorbis-1.3.7-r0 +libvpx-1.9.0-r0 +libx11-1.7.0-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r5 +libxml2-2.9.10-r6 libxslt-1.1.34-r0 -linux-pam-1.3.1-r4 -musl-1.1.24-r10 -musl-utils-1.1.24-r10 -ncurses-libs-6.2_p20200523-r0 -ncurses-terminfo-base-6.2_p20200523-r0 -nettle-3.5.1-r1 -nghttp2-libs-1.41.0-r0 -opus-1.3.1-r0 +linux-pam-1.5.1-r0 +musl-1.2.2-r0 +musl-utils-1.2.2-r0 +ncurses-libs-6.2_p20210109-r0 +ncurses-terminfo-base-6.2_p20210109-r0 +nettle-3.7-r0 +nghttp2-libs-1.42.0-r1 +opus-1.3.1-r1 p11-kit-0.23.22-r0 +pcre-8.44-r0 procps-3.3.16-r0 -python3-3.8.5-r0 -readline-8.0.4-r0 -scanelf-1.2.6-r0 -sdl2-2.0.12-r1 +python3-3.8.7-r0 +readline-8.1.0-r0 +s6-ipcserver-2.10.0.0-r0 +scanelf-1.2.8-r0 +sdl2-2.0.14-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r19 +skalibs-2.10.0.0-r0 +soxr-0.1.3-r2 +sqlite-libs-3.34.1-r0 +ssl_client-1.32.1-r2 tzdata-2021a-r0 -unrar-5.9.2-r0 +unrar-6.0.3-r0 unzip-6.0-r8 +utmps-0.1.0.0-r0 v4l-utils-libs-1.20.0-r0 -wayland-libs-client-1.18.0-r4 +vidstab-1.1.0-r1 +vulkan-loader-1.2.137-r0 +wayland-libs-client-1.18.0-r5 x264-libs-20191119-r1 -x265-libs-3.3-r1 +x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r0 xz-libs-5.2.5-r0 From 8031c0663078de24be199096653168b3331baf01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Feb 2021 15:52:15 -0500 Subject: [PATCH 166/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7efe8dd..a7be18c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ aom-libs-1.0.0-r1 apk-tools-2.12.1-r0 bash-5.1.0-r0 brotli-libs-1.0.9-r3 -busybox-1.32.1-r2 +busybox-1.32.1-r3 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 @@ -87,7 +87,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r2 +ssl_client-1.32.1-r3 tzdata-2021a-r0 unrar-6.0.3-r0 unzip-6.0-r8 From 0ad674d796c8750f7321f119349d49139910911e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Feb 2021 18:16:12 +0000 Subject: [PATCH 167/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a7be18c..8c4d211 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 procps-3.3.16-r0 -python3-3.8.7-r0 +python3-3.8.7-r1 readline-8.1.0-r0 s6-ipcserver-2.10.0.0-r0 scanelf-1.2.8-r0 From 1a3e66da16060c93b45784bdad6d99f7ace1de75 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Feb 2021 12:52:14 +0000 Subject: [PATCH 168/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8c4d211..9c7e1d0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.36.1-r1 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1i-r0 +libcrypto1.1-1.1.1j-r0 libcurl-7.74.0-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 @@ -48,7 +48,7 @@ libpng-1.6.37-r1 libproc-3.3.16-r0 libsrt-1.4.2-r0 libssh-0.9.5-r0 -libssl1.1-1.1.1i-r0 +libssl1.1-1.1.1j-r0 libstdc++-10.2.1_pre1-r3 libtasn1-4.16.0-r1 libtheora-1.1.1-r16 From 092f6a2bba8c588cdc971f5c6b4884e808a72fa1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Mar 2021 13:55:37 +0000 Subject: [PATCH 169/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9c7e1d0..50d98f6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r3 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.74.0-r0 +curl-7.74.0-r1 expat-2.2.10-r1 ffmpeg-4.3.1-r3 ffmpeg-libs-4.3.1-r3 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1j-r0 -libcurl-7.74.0-r0 +libcurl-7.74.0-r1 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 From 78edc069d3e5cbc87d94d7d10504d68bb924750d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Mar 2021 09:10:00 -0500 Subject: [PATCH 170/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 50d98f6..c586ce8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ fontconfig-2.13.1-r3 freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 -glib-2.66.7-r0 +glib-2.66.7-r1 gmp-6.2.1-r0 gnutls-3.7.0-r0 graphite2-1.3.14-r0 From 4746e5e458aa93b86a03e4cbb4d14277c64ffe8d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Mar 2021 10:52:41 -0500 Subject: [PATCH 171/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c586ce8..31de02d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,7 +19,7 @@ fribidi-1.0.10-r0 gdbm-1.19-r0 glib-2.66.7-r1 gmp-6.2.1-r0 -gnutls-3.7.0-r0 +gnutls-3.7.1-r0 graphite2-1.3.14-r0 harfbuzz-2.7.4-r1 lame-3.100-r0 From 814c80d47cf9bc08a41f24614e2a7bc94248f57b Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 13 Mar 2021 22:42:17 -0500 Subject: [PATCH 172/525] build pre-releases instead of commits --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 5 ++-- Dockerfile.aarch64 | 5 ++-- Dockerfile.armhf | 5 ++-- Jenkinsfile | 36 ++++++++++++-------------- README.md | 1 + jenkins-vars.yml | 4 +-- readme-vars.yml | 1 + 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 1d3b0d2..d183e70 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/commits/development" | jq -r '. | .sha' | cut -c1-8) + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases" | jq -r '.[0] | .tag_name') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for bazarr branch development" diff --git a/Dockerfile b/Dockerfile index 4784baa..b87bd29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ g++ \ gcc \ + jq \ libxml2-dev \ libxslt-dev \ py3-pip \ @@ -29,8 +30,8 @@ RUN \ unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5df045d..66a89dd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,6 +14,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ g++ \ gcc \ + jq \ libxml2-dev \ libxslt-dev \ py3-pip \ @@ -29,8 +30,8 @@ RUN \ unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1e48225..c1360b0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -14,6 +14,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ g++ \ gcc \ + jq \ libxml2-dev \ libxslt-dev \ py3-pip \ @@ -29,8 +30,8 @@ RUN \ unzip && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/commits/development \ - | awk '/sha/{print $4;exit}' FS='[""]'); \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ /tmp/bazarr.tar.gz -L \ diff --git a/Jenkinsfile b/Jenkinsfile index d85c286..0923e0e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,8 +27,6 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr' PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr' DIST_IMAGE = 'alpine' - DIST_TAG = '3.8' - DIST_PACKAGES = 'none' MULTIARCH='true' CI='true' CI_WEB='true' @@ -103,23 +101,23 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a github commit trigger determine the current commit at head - stage("Set ENV github_commit"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', - returnStdout: true).trim() - } - } + // If this is a devel github release use the first in an array from github to determine the ext tag + stage("Set ENV github_devel"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''', + returnStdout: true).trim() + } + } } - // If this is a github commit trigger Set the external release link - stage("Set ENV commit_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE - } - } + // If this is a stable or devel github release generate the link for the build message + stage("Set ENV github_link"){ + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE + } + } } // Sanitize the release tag and strip illegal docker or github characters stage("Sanitize tag"){ @@ -748,7 +746,7 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "development",\ "name": "'${META_TAG}'",\ diff --git a/README.md b/README.md index 9c5f29b..2410f33 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.03.21:** - Build from Github pre-releases. * **23.01.21:** - Rebasing to alpine 3.13. * **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **19.12.19:** - Rebasing to alpine 3.12. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e1366fc..5bc4f08 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-bazarr -external_type: github_commit +external_type: github_devel release_type: prerelease release_tag: development ls_branch: development @@ -18,8 +18,6 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/bazarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/bazarr' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.8' - - DIST_PACKAGES = 'none' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index f96e721..b239eae 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.03.21:", desc: "Build from Github pre-releases." } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." } From e5ec4a0c3734a40dd7c332b4fe44a1c457dc5342 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Mar 2021 05:42:13 +0000 Subject: [PATCH 173/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 31de02d..1e79751 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 procps-3.3.16-r0 -python3-3.8.7-r1 +python3-3.8.8-r0 readline-8.1.0-r0 s6-ipcserver-2.10.0.0-r0 scanelf-1.2.8-r0 From 3cf395f0ecaf2ca04c921732f3d8dec2f8b18422 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Mar 2021 08:03:43 +0000 Subject: [PATCH 174/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1e79751..5efcb4a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.36.1-r1 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1j-r0 +libcrypto1.1-1.1.1k-r0 libcurl-7.74.0-r1 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 @@ -48,7 +48,7 @@ libpng-1.6.37-r1 libproc-3.3.16-r0 libsrt-1.4.2-r0 libssh-0.9.5-r0 -libssl1.1-1.1.1j-r0 +libssl1.1-1.1.1k-r0 libstdc++-10.2.1_pre1-r3 libtasn1-4.16.0-r1 libtheora-1.1.1-r16 From 4e8f5b0000811171cf8d644a4be63d03d705ccc9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 30 Mar 2021 09:35:11 -0400 Subject: [PATCH 175/525] add package_info --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index b87bd29..74a763c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,7 @@ RUN \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 66a89dd..1103900 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -42,6 +42,7 @@ RUN \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c1360b0..884ea31 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -42,6 +42,7 @@ RUN \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ rm -Rf /app/bazarr/bin && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/requirements.txt && \ From 91333138882a1fb84bb410971e19f8400cdc99d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Apr 2021 09:04:51 +0100 Subject: [PATCH 176/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5efcb4a..f3279c9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,10 +2,10 @@ alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 -apk-tools-2.12.1-r0 +apk-tools-2.12.4-r2 bash-5.1.0-r0 brotli-libs-1.0.9-r3 -busybox-1.32.1-r3 +busybox-1.32.1-r5 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 @@ -87,7 +87,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r3 +ssl_client-1.32.1-r5 tzdata-2021a-r0 unrar-6.0.3-r0 unzip-6.0-r8 From d8bc0f33da8c121cc1eb105000ccec99596256ed Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Apr 2021 13:46:58 -0400 Subject: [PATCH 177/525] change app folder to match other *arrs --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 8 ++++---- Dockerfile.armhf | 8 ++++---- README.md | 1 + readme-vars.yml | 1 + root/etc/services.d/bazarr/run | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74a763c..8922628 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,15 +37,15 @@ RUN \ /tmp/bazarr.tar.gz -L \ "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ mkdir -p \ - /app/bazarr && \ + /app/bazarr/bin && \ tar xf \ /tmp/bazarr.tar.gz -C \ - /app/bazarr --strip-components=1 && \ - rm -Rf /app/bazarr/bin && \ + /app/bazarr/bin --strip-components=1 && \ + rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1103900..54b4f0f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -37,15 +37,15 @@ RUN \ /tmp/bazarr.tar.gz -L \ "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ mkdir -p \ - /app/bazarr && \ + /app/bazarr/bin && \ tar xf \ /tmp/bazarr.tar.gz -C \ - /app/bazarr --strip-components=1 && \ - rm -Rf /app/bazarr/bin && \ + /app/bazarr/bin --strip-components=1 && \ + rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 884ea31..67941d6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -37,15 +37,15 @@ RUN \ /tmp/bazarr.tar.gz -L \ "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ mkdir -p \ - /app/bazarr && \ + /app/bazarr/bin && \ tar xf \ /tmp/bazarr.tar.gz -C \ - /app/bazarr --strip-components=1 && \ - rm -Rf /app/bazarr/bin && \ + /app/bazarr/bin --strip-components=1 && \ + rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ - /app/bazarr/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/README.md b/README.md index 2410f33..69a0cf5 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.04.21:** - Move app to /app/bazarr/bin. * **13.03.21:** - Build from Github pre-releases. * **23.01.21:** - Rebasing to alpine 3.13. * **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. diff --git a/readme-vars.yml b/readme-vars.yml index b239eae..152029a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin." } - { date: "13.03.21:", desc: "Build from Github pre-releases." } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run index 36c6402..e375f97 100644 --- a/root/etc/services.d/bazarr/run +++ b/root/etc/services.d/bazarr/run @@ -6,5 +6,5 @@ if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then fi exec \ - s6-setuidgid abc python3 /app/bazarr/bazarr.py \ + s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \ --no-update --config /config From 44c86aec61a1df259df44daaf039e6973879b02e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 13 Apr 2021 07:08:03 -0400 Subject: [PATCH 178/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f3279c9..aeacb64 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 -apk-tools-2.12.4-r2 +apk-tools-2.12.5-r0 bash-5.1.0-r0 brotli-libs-1.0.9-r3 busybox-1.32.1-r5 From 0a5fa40c3fd998a8e292dcd10c562714fcbdfe30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 04:15:20 -0400 Subject: [PATCH 179/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aeacb64..c1f3ae8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r5 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.74.0-r1 +curl-7.76.1-r0 expat-2.2.10-r1 ffmpeg-4.3.1-r3 ffmpeg-libs-4.3.1-r3 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.74.0-r1 +libcurl-7.76.1-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 From 2cf95e5df74accff6b3df981899de214cb05aba0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 Apr 2021 07:53:43 +0000 Subject: [PATCH 180/525] Bot Updating Templated Files --- Jenkinsfile | 92 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0923e0e..d091e38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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 ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -106,7 +106,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''', + script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''', returnStdout: true).trim() } } @@ -317,22 +317,24 @@ pipeline { git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi - mkdir -p ${TEMPDIR}/unraid + mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, skipping Unraid template upload" + echo "Image is on the ignore list, removing Unraid template" + git rm unraid/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Removing Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi rm -Rf ${TEMPDIR}''' script{ @@ -389,8 +391,21 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bazarr\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bazarr\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bazarr\" \ + --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ + --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -403,8 +418,21 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bazarr\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bazarr\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bazarr\" \ + --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -417,8 +445,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bazarr\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bazarr\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bazarr\" \ + --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -438,8 +479,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bazarr\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bazarr\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bazarr\" \ + --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -746,11 +800,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "development",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' @@ -775,7 +829,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ From 3607b26824219cf6b704cde94e93541e234f28e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 Apr 2021 08:54:56 +0100 Subject: [PATCH 181/525] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 11 +++---- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/greetings.yml | 4 +-- README.md | 49 +++++++++++++++++--------------- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4e69847..e4d29da 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,7 +24,7 @@ ## Readme If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. -Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-bazarr/edit/master/readme-vars.yml). +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-bazarr/edit/development/readme-vars.yml). These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-bazarr) @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the ### Testing your changes -``` +```bash git clone https://github.com/linuxserver/docker-bazarr.git cd docker-bazarr docker build \ @@ -106,15 +106,16 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. -## Update the chagelog +## Update the changelog -If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bazarr/tree/master/root), add an entry to the changelog +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bazarr/tree/development/root), add an entry to the changelog ```yml changelogs: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 422815d..f312e39 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ ------------------------------ - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-bazarr/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-bazarr/blob/development/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications ------------------------------ diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index d044e7d..43a005a 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-bazarr/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bazarr/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/blob/development/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 69a0cf5..db89f4b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) @@ -12,13 +12,14 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: - * regular and timely application updates - * easy user mappings (PGID, PUID) - * custom base image with s6 overlay - * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth - * regular security updates +* regular and timely application updates +* easy user mappings (PGID, PUID) +* custom base image with s6 overlay +* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth +* regular security updates Find us at: + * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. @@ -39,7 +40,6 @@ Find us at: [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. - [![bazarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png)](https://github.com/morpheus65535/bazarr) ## Supported Architectures @@ -56,6 +56,10 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Application Setup + +- Once running the URL will be `http://:6767`. +- You must complete all the setup parameters in the webui before you can save the config. ## Usage @@ -87,7 +91,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=bazarr \ -e PUID=1000 \ @@ -106,7 +110,6 @@ Add one of the tags, if required, to the linuxserver/bazarr line of the run/cr The development tag will be the latest commit in the development branch of bazarr. HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!! - ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -127,7 +130,7 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: -``` +```bash -e FILE__PASSWORD=/run/secrets/mysecretpassword ``` @@ -146,25 +149,17 @@ Ensure any volume directories on the host are owned by the same user you specify In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: -``` +```bash $ id username uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` - -  -## Application Setup - -- Once running the URL will be `http://:6767`. -- You must complete all the setup parameters in the webui before you can save the config. - - ## Docker Mods + [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=bazarr&query=%24.mods%5B%27bazarr%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bazarr "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. - ## Support Info * Shell access whilst the container is running: `docker exec -it bazarr /bin/bash` @@ -181,6 +176,7 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Compose + * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull bazarr` * Let compose update all containers as necessary: `docker-compose up -d` @@ -188,6 +184,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run + * Update the image: `docker pull ghcr.io/linuxserver/bazarr` * Stop the running container: `docker stop bazarr` * Delete the container: `docker rm bazarr` @@ -195,24 +192,29 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) + * Pull the latest image at its tag and replace it with the same env variables in one run: - ``` + + ```bash docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ containrrr/watchtower \ --run-once bazarr ``` + * You can also remove the old dangling images: `docker image prune` **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) + * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: -``` + +```bash git clone https://github.com/linuxserver/docker-bazarr.git cd docker-bazarr docker build \ @@ -222,7 +224,8 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` From 44ee0e924e7522f7fb8d44d305afa46e38c5e3b0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 Apr 2021 09:01:51 +0000 Subject: [PATCH 182/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c1f3ae8..c1ba41a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -72,7 +72,7 @@ musl-1.2.2-r0 musl-utils-1.2.2-r0 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 -nettle-3.7-r0 +nettle-3.7.2-r0 nghttp2-libs-1.42.0-r1 opus-1.3.1-r1 p11-kit-0.23.22-r0 From 80bb1bfca333b22ff2e81feaa7508b34667b6c74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 05:44:34 +0100 Subject: [PATCH 183/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index db89f4b..46c404a 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Find us at: [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bazarr/latest/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. + [![bazarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png)](https://github.com/morpheus65535/bazarr) ## Supported Architectures From 5c8006ce898c3014156cea520dc8973ca6543ec3 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 19 Apr 2021 11:24:47 -0400 Subject: [PATCH 184/525] install from zip --- Dockerfile | 83 +++++++++++++++++----------------- Dockerfile.aarch64 | 83 +++++++++++++++++----------------- Dockerfile.armhf | 83 +++++++++++++++++----------------- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/30-config | 2 +- root/etc/services.d/bazarr/run | 8 ++-- 7 files changed, 130 insertions(+), 131 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8922628..a69a587 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,48 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ - jq \ - libxml2-dev \ - libxslt-dev \ - py3-pip \ - python3-dev && \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - ffmpeg \ - libxml2 \ - libxslt \ - python3 \ - unrar \ - unzip && \ - echo "**** install bazarr ****" && \ - if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ - | jq -r '.[0] | .tag_name'); \ - fi && \ - curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ - mkdir -p \ - /app/bazarr/bin && \ - tar xf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ - rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ - echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ - /app/bazarr/bin/requirements.txt && \ - echo "**** clean up ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py3-pip \ + python3-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python3 \ + unrar \ + unzip && \ + echo "**** install bazarr ****" && \ + if [ -z ${BAZARR_VERSION+x} ]; then \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ + fi && \ + curl -o \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + mkdir -p \ + /app/bazarr/bin && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ + rm -Rf /app/bazarr/bin/bin && \ + echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "**** Install requirements ****" && \ + pip3 install --no-cache-dir -U -r \ + /app/bazarr/bin/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 54b4f0f..e0b5ce4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,48 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ - jq \ - libxml2-dev \ - libxslt-dev \ - py3-pip \ - python3-dev && \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - ffmpeg \ - libxml2 \ - libxslt \ - python3 \ - unrar \ - unzip && \ - echo "**** install bazarr ****" && \ - if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ - | jq -r '.[0] | .tag_name'); \ - fi && \ - curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ - mkdir -p \ - /app/bazarr/bin && \ - tar xf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ - rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ - echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ - /app/bazarr/bin/requirements.txt && \ - echo "**** clean up ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py3-pip \ + python3-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python3 \ + unrar \ + unzip && \ + echo "**** install bazarr ****" && \ + if [ -z ${BAZARR_VERSION+x} ]; then \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ + fi && \ + curl -o \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + mkdir -p \ + /app/bazarr/bin && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ + rm -Rf /app/bazarr/bin/bin && \ + echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "**** Install requirements ****" && \ + pip3 install --no-cache-dir -U -r \ + /app/bazarr/bin/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 67941d6..b6a12c1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -10,48 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ - jq \ - libxml2-dev \ - libxslt-dev \ - py3-pip \ - python3-dev && \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - ffmpeg \ - libxml2 \ - libxslt \ - python3 \ - unrar \ - unzip && \ - echo "**** install bazarr ****" && \ - if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ - | jq -r '.[0] | .tag_name'); \ - fi && \ - curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/${BAZARR_VERSION}.tar.gz" && \ - mkdir -p \ - /app/bazarr/bin && \ - tar xf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ - rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ - echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ - /app/bazarr/bin/requirements.txt && \ - echo "**** clean up ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + py3-pip \ + python3-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + ffmpeg \ + libxml2 \ + libxslt \ + python3 \ + unrar \ + unzip && \ + echo "**** install bazarr ****" && \ + if [ -z ${BAZARR_VERSION+x} ]; then \ + BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ + | jq -r '.[0] | .tag_name'); \ + fi && \ + curl -o \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + mkdir -p \ + /app/bazarr/bin && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ + rm -Rf /app/bazarr/bin/bin && \ + echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "**** Install requirements ****" && \ + pip3 install --no-cache-dir -U -r \ + /app/bazarr/bin/requirements.txt && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/README.md b/README.md index 46c404a..b058ea3 100644 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.04.21:** - Install from release zip. * **07.04.21:** - Move app to /app/bazarr/bin. * **13.03.21:** - Build from Github pre-releases. * **23.01.21:** - Rebasing to alpine 3.13. diff --git a/readme-vars.yml b/readme-vars.yml index 152029a..9295b88 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.04.21:", desc: "Install from release zip." } - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin." } - { date: "13.03.21:", desc: "Build from Github pre-releases." } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 4a919c2..aa3208d 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,4 +2,4 @@ # permissions chown -R abc:abc \ - /config + /config diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run index e375f97..05019cf 100644 --- a/root/etc/services.d/bazarr/run +++ b/root/etc/services.d/bazarr/run @@ -1,10 +1,10 @@ #!/usr/bin/with-contenv bash if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then - echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" - umask ${UMASK_SET} + echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" + umask ${UMASK_SET} fi exec \ - s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \ - --no-update --config /config + s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \ + --no-update --config /config From 22593cfe992298d7856f90db53d68f46eaca3c9b Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 19 Apr 2021 14:45:02 -0400 Subject: [PATCH 185/525] fix branch typo --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a69a587..d217686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/bin/requirements.txt && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e0b5ce4..1b2dcf2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,7 +41,7 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/bin/requirements.txt && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b6a12c1..9c5fc76 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -41,7 +41,7 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install --no-cache-dir -U -r \ /app/bazarr/bin/requirements.txt && \ From ff0666fbb21b56e4eeb2f6237e0b2fc144e72755 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Apr 2021 08:04:44 +0000 Subject: [PATCH 186/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c1ba41a..c2f0f87 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ aom-libs-1.0.0-r1 apk-tools-2.12.5-r0 bash-5.1.0-r0 brotli-libs-1.0.9-r3 -busybox-1.32.1-r5 +busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 @@ -87,7 +87,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r5 +ssl_client-1.32.1-r6 tzdata-2021a-r0 unrar-6.0.3-r0 unzip-6.0-r8 From cf86c895222622ec0aabd698b2a41b5c1b89fb74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Apr 2021 04:05:41 -0400 Subject: [PATCH 187/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c2f0f87..f49274c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ fontconfig-2.13.1-r3 freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 -glib-2.66.7-r1 +glib-2.66.8-r0 gmp-6.2.1-r0 gnutls-3.7.1-r0 graphite2-1.3.14-r0 From fba71d58e9d09913776238226fbd607775bd25c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 24 Apr 2021 08:10:14 +0000 Subject: [PATCH 188/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f49274c..1fd7c00 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ libgcrypt-1.8.7-r0 libgomp-10.2.1_pre1-r3 libgpg-error-1.41-r0 libintl-0.20.2-r2 -libjpeg-turbo-2.0.6-r0 +libjpeg-turbo-2.1.0-r0 libmount-2.36.1-r1 libogg-1.3.4-r0 libpciaccess-0.16-r0 From 3a98ca07f8e16b77dfd713ba8586c2cbb29e5eed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 May 2021 04:03:35 -0400 Subject: [PATCH 189/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1fd7c00..72feb0f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 procps-3.3.16-r0 -python3-3.8.8-r0 +python3-3.8.10-r0 readline-8.1.0-r0 s6-ipcserver-2.10.0.0-r0 scanelf-1.2.8-r0 From f7a7e9c5d234d4841c2fc0fd71f14623398a1efd Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sat, 8 May 2021 19:01:19 +0200 Subject: [PATCH 190/525] Add new requirements to deal with upstream changes --- Dockerfile | 4 ++++ Dockerfile.aarch64 | 4 ++++ Dockerfile.armhf | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index d217686..781125a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,15 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ g++ \ gcc \ + jq \ + libffi-dev \ libxml2-dev \ libxslt-dev \ py3-pip \ + py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1b2dcf2..5dff49f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,11 +12,15 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ g++ \ gcc \ + jq \ + libffi-dev \ libxml2-dev \ libxslt-dev \ py3-pip \ + py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9c5fc76..80dbd6c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,11 +12,15 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ + build-base \ g++ \ gcc \ + jq \ + libffi-dev \ libxml2-dev \ libxslt-dev \ py3-pip \ + py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ From c8068d796242588b27d8667d8188d2c4a5ebed4c Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sun, 9 May 2021 01:00:26 +0200 Subject: [PATCH 191/525] Keep pip --- Dockerfile | 3 +-- Dockerfile.aarch64 | 3 +-- Dockerfile.armhf | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 781125a..8b6ff8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,6 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ - py3-pip \ - py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -28,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5dff49f..d351324 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -19,8 +19,6 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ - py3-pip \ - py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -28,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 80dbd6c..6c326f2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -19,8 +19,6 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ - py3-pip \ - py3-wheel \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -28,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ From 6e9460e10f0a6c5a33051688d37df2e1f041ed34 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 9 May 2021 02:14:17 +0000 Subject: [PATCH 192/525] Bot Updating Package Versions --- package_versions.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 72feb0f..2a84c9f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,6 +78,31 @@ opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 procps-3.3.16-r0 +py3-appdirs-1.4.4-r1 +py3-cachecontrol-0.12.6-r0 +py3-chardet-4.0.0-r0 +py3-colorama-0.4.4-r0 +py3-contextlib2-0.6.0-r0 +py3-distlib-0.3.1-r1 +py3-distro-1.5.0-r1 +py3-html5lib-1.1-r0 +py3-idna-3.1-r0 +py3-lockfile-0.12.2-r3 +py3-msgpack-1.0.2-r0 +py3-ordered-set-4.0.2-r0 +py3-packaging-20.9-r0 +py3-parsing-2.4.7-r1 +py3-pep517-0.9.1-r0 +py3-pip-20.3.4-r0 +py3-progress-1.5-r0 +py3-pytoml-0.1.21-r0 +py3-requests-2.25.1-r1 +py3-retrying-1.3.3-r0 +py3-setuptools-51.3.3-r0 +py3-six-1.15.0-r0 +py3-toml-0.10.2-r0 +py3-urllib3-1.26.2-r1 +py3-webencodings-0.5.1-r3 python3-3.8.10-r0 readline-8.1.0-r0 s6-ipcserver-2.10.0.0-r0 From 22cafab9e416b9ec01169dae5468609ab5ebbf89 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sun, 16 May 2021 20:45:43 +0200 Subject: [PATCH 193/525] Use prebuilt wheels --- Dockerfile | 5 +---- Dockerfile.aarch64 | 5 +---- Dockerfile.armhf | 5 +---- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 781125a..ef1ffae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,9 +16,6 @@ RUN \ g++ \ gcc \ jq \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ py3-pip \ py3-wheel \ python3-dev && \ @@ -47,7 +44,7 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5dff49f..2523c63 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,9 +16,6 @@ RUN \ g++ \ gcc \ jq \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ py3-pip \ py3-wheel \ python3-dev && \ @@ -47,7 +44,7 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 80dbd6c..a7906f5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,9 +16,6 @@ RUN \ g++ \ gcc \ jq \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ py3-pip \ py3-wheel \ python3-dev && \ @@ -47,7 +44,7 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install --no-cache-dir -U -r \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ diff --git a/README.md b/README.md index b058ea3..77dc2a0 100644 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.05.21:** - Use wheel index. * **19.04.21:** - Install from release zip. * **07.04.21:** - Move app to /app/bazarr/bin. * **13.03.21:** - Build from Github pre-releases. diff --git a/readme-vars.yml b/readme-vars.yml index 9295b88..db93694 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.05.21:", desc: "Use wheel index." } - { date: "19.04.21:", desc: "Install from release zip." } - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin." } - { date: "13.03.21:", desc: "Build from Github pre-releases." } From c98865348ea4251699fe9d3a4013d54b248fb25f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 May 2021 07:51:29 +0000 Subject: [PATCH 194/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2a84c9f..12f85e4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -59,7 +59,7 @@ libva-2.10.0-r0 libvdpau-1.4-r0 libvorbis-1.3.7-r0 libvpx-1.9.0-r0 -libx11-1.7.0-r0 +libx11-1.7.1-r0 libxau-1.0.9-r0 libxcb-1.14-r1 libxdmcp-1.1.3-r0 From 4575dcb6d18e818b4d883c1a1d03314a7f43b227 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 May 2021 07:45:13 +0000 Subject: [PATCH 195/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 12f85e4..213d542 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.76.1-r0 +curl-7.77.0-r0 expat-2.2.10-r1 ffmpeg-4.3.1-r3 ffmpeg-libs-4.3.1-r3 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcurl-7.77.0-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 From 99afdc6b7d0b1248ee60a5c83c44aefdeea6e4e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Jun 2021 05:46:58 -0400 Subject: [PATCH 196/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 213d542..b49c13f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,8 +11,8 @@ ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 curl-7.77.0-r0 expat-2.2.10-r1 -ffmpeg-4.3.1-r3 -ffmpeg-libs-4.3.1-r3 +ffmpeg-4.3.1-r4 +ffmpeg-libs-4.3.1-r4 fontconfig-2.13.1-r3 freetype-2.10.4-r1 fribidi-1.0.10-r0 From cd221d4c1435a9055ed127176cdf8e4d2fd5e507 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Jun 2021 05:53:03 +0000 Subject: [PATCH 197/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b49c13f..98dc521 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -65,7 +65,7 @@ libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r6 +libxml2-2.9.10-r7 libxslt-1.1.34-r0 linux-pam-1.5.1-r0 musl-1.2.2-r0 From a18377a4117ef4cbad06df5d6dd66623edad3472 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jun 2021 03:25:32 -0400 Subject: [PATCH 198/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 98dc521..1a1a45f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -68,8 +68,8 @@ libxfixes-5.0.3-r2 libxml2-2.9.10-r7 libxslt-1.1.34-r0 linux-pam-1.5.1-r0 -musl-1.2.2-r0 -musl-utils-1.2.2-r0 +musl-1.2.2-r1 +musl-utils-1.2.2-r1 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 nettle-3.7.2-r0 From 9c3c5279f46b1dcfaba6f7648350ef23367d5c7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Jun 2021 07:36:38 +0000 Subject: [PATCH 199/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1a1a45f..c2c458c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.77.0-r0 +curl-7.77.0-r1 expat-2.2.10-r1 ffmpeg-4.3.1-r4 ffmpeg-libs-4.3.1-r4 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.77.0-r0 +libcurl-7.77.0-r1 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 From 0045068df33890f5116468dc9e927f915e6e630d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Jun 2021 07:15:28 +0000 Subject: [PATCH 200/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c2c458c..1e0257f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ sqlite-libs-3.34.1-r0 ssl_client-1.32.1-r6 tzdata-2021a-r0 unrar-6.0.3-r0 -unzip-6.0-r8 +unzip-6.0-r9 utmps-0.1.0.0-r0 v4l-utils-libs-1.20.0-r0 vidstab-1.1.0-r1 From 888ccedd2bf7a5090bd639a054399a4855aa196d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Jul 2021 02:58:31 -0400 Subject: [PATCH 201/525] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d091e38..2d8a34f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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 ./root/donate.txt' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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 ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -270,7 +270,6 @@ pipeline { git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f development - cd ${TEMPDIR}/docker-${CONTAINER_NAME} for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done @@ -531,6 +530,15 @@ pipeline { apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "fedora" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + rpm -qa > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "arch" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + pacman -Q > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From 93da9442fe9d331de9106a9eeb8e2c784f36e4e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Jul 2021 07:53:19 +0000 Subject: [PATCH 202/525] Bot Updating Templated Files --- .editorconfig | 20 ++++++++++++++++++++ .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/stale.yml | 2 +- README.md | 7 ++----- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..a92f7df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# This file is globally distributed to all container image projects from +# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +# trim_trailing_whitespace may cause unintended issues and should not be globally set true +trim_trailing_whitespace = false + +[{Dockerfile*,**.yml}] +indent_style = space +indent_size = 2 + +[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e4d29da..6500438 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. * Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue + * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f312e39..d91ab05 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ - + diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420..3b3846e 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v3 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." diff --git a/README.md b/README.md index 77dc2a0..fc0eec3 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bazarr/container_registry) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bazarr "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) @@ -66,9 +65,7 @@ The architectures supported by this image are: Here are some example snippets to help you get started creating a container. -### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) - -Compatible with docker-compose v2 schemas. +### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml --- @@ -90,7 +87,7 @@ services: restart: unless-stopped ``` -### docker cli +### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) ```bash docker run -d \ From a454eba22f01b2593de2028af8c2de0bf5ed6499 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Jul 2021 08:13:15 +0000 Subject: [PATCH 203/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1e0257f..4561d0c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 -libgcrypt-1.8.7-r0 +libgcrypt-1.8.8-r0 libgomp-10.2.1_pre1-r3 libgpg-error-1.41-r0 libintl-0.20.2-r2 From 3c75d69e3cfc780d5ab7462f202bee6014c7df41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Jul 2021 06:56:26 +0200 Subject: [PATCH 204/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4561d0c..a75b331 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.77.0-r1 +curl-7.78.0-r0 expat-2.2.10-r1 ffmpeg-4.3.1-r4 ffmpeg-libs-4.3.1-r4 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.77.0-r1 +libcurl-7.78.0-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 @@ -65,7 +65,7 @@ libxcb-1.14-r1 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 -libxml2-2.9.10-r7 +libxml2-2.9.12-r0 libxslt-1.1.34-r0 linux-pam-1.5.1-r0 musl-1.2.2-r1 From d340260918c1be687fcda9dd930053e3c922a479 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 4 Aug 2021 09:15:45 +0200 Subject: [PATCH 205/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a75b331..1aa5267 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 -apk-tools-2.12.5-r0 +apk-tools-2.12.6-r0 bash-5.1.0-r0 brotli-libs-1.0.9-r3 busybox-1.32.1-r6 From 2a283a63f6ede2d475b2173586ea2676086c661a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Aug 2021 09:14:13 +0200 Subject: [PATCH 206/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1aa5267..c8743bc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 -apk-tools-2.12.6-r0 +apk-tools-2.12.7-r0 bash-5.1.0-r0 brotli-libs-1.0.9-r3 busybox-1.32.1-r6 From 057423afb568598e7e688a735326f00dc2d65214 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 25 Aug 2021 08:56:19 +0200 Subject: [PATCH 207/525] Bot Updating Templated Files --- Jenkinsfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2d8a34f..6d3c5e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -385,7 +385,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -410,7 +412,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { From d3a3dfae3072af103467c846fc74e6fc0b01d119 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 27 Aug 2021 08:55:27 +0200 Subject: [PATCH 208/525] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d3c5e9..e44eaea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -520,7 +520,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -581,7 +581,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -605,7 +605,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} From ab81f2a37e0c4d7d8b6e7bd6737ed9d151f9b0c8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 19:10:41 +0200 Subject: [PATCH 209/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c8743bc..d767814 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.36.1-r1 libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1k-r0 +libcrypto1.1-1.1.1l-r0 libcurl-7.78.0-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 @@ -48,7 +48,7 @@ libpng-1.6.37-r1 libproc-3.3.16-r0 libsrt-1.4.2-r0 libssh-0.9.5-r0 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libstdc++-10.2.1_pre1-r3 libtasn1-4.16.0-r1 libtheora-1.1.1-r16 From 1422050c8fd4a0a30beec7f0b735909fee662747 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 15 Sep 2021 08:58:35 +0200 Subject: [PATCH 210/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d767814..b993c25 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 -libgcrypt-1.8.8-r0 +libgcrypt-1.8.8-r1 libgomp-10.2.1_pre1-r3 libgpg-error-1.41-r0 libintl-0.20.2-r2 From c1f6e5de4cd28fa0cfb9c0d32d2896e5407625b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Sep 2021 09:10:14 +0200 Subject: [PATCH 211/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b993c25..e2b8c33 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.78.0-r0 +curl-7.79.0-r0 expat-2.2.10-r1 ffmpeg-4.3.1-r4 ffmpeg-libs-4.3.1-r4 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 -libcurl-7.78.0-r0 +libcurl-7.79.0-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 @@ -72,7 +72,7 @@ musl-1.2.2-r1 musl-utils-1.2.2-r1 ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 -nettle-3.7.2-r0 +nettle-3.7.3-r0 nghttp2-libs-1.42.0-r1 opus-1.3.1-r1 p11-kit-0.23.22-r0 From 929e62f0c45ae843da1f4cba1721d8c826c94e25 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Sep 2021 09:11:49 +0200 Subject: [PATCH 212/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e2b8c33..2a96ba6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.32.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 -curl-7.79.0-r0 +curl-7.79.1-r0 expat-2.2.10-r1 ffmpeg-4.3.1-r4 ffmpeg-libs-4.3.1-r4 @@ -31,7 +31,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 -libcurl-7.79.0-r0 +libcurl-7.79.1-r0 libdav1d-0.8.1-r0 libdrm-2.4.104-r0 libffi-3.3-r2 From 9650f1ce1742fcd2eb812b1a249e0be0a3de1f40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 29 Sep 2021 09:13:19 +0200 Subject: [PATCH 213/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2a96ba6..00be191 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -113,7 +113,7 @@ skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 ssl_client-1.32.1-r6 -tzdata-2021a-r0 +tzdata-2021b-r0 unrar-6.0.3-r0 unzip-6.0-r9 utmps-0.1.0.0-r0 From 397b752d22c1799c4929889bef05aab748027aa3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 06:39:52 +0200 Subject: [PATCH 214/525] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e44eaea..8a122a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -126,6 +127,23 @@ pipeline { env.EXT_RELEASE_CLEAN = sh( script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() + + env.SEMVER = (new Date()).format('YYYY.MM.dd') + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + if (semver.find()) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else { + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + if (semver.find()) { + if (semver[0][3]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else if (!semver[0][3] && !semver[0][4]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" + } + } + } + + println("SEMVER: ${env.SEMVER}") } } } @@ -140,6 +158,7 @@ pipeline { env.IMAGE = env.DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -162,6 +181,7 @@ pipeline { env.IMAGE = env.DEV_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -184,6 +204,7 @@ pipeline { env.IMAGE = env.PR_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -379,6 +400,48 @@ pipeline { "visibility":"public"}' ''' } } + /* ####################### + Scarf.sh package registry + ####################### */ + // Add package to Scarf.sh and set permissions + stage("Scarf.sh package registry"){ + when { + branch "development" + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''#! /bin/bash + set -e + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid') + if [ -z "${PACKAGE_UUID}" ]; then + echo "Adding package to Scarf.sh" + PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{"name":"linuxserver/bazarr",\ + "shortDescription":"example description",\ + "libraryType":"docker",\ + "website":"https://github.com/linuxserver/docker-bazarr",\ + "backendUrl":"https://ghcr.io/linuxserver/bazarr",\ + "publicUrl":"https://lscr.io/linuxserver/bazarr"}' \ + | jq -r .uuid) + else + echo "Package already exists on Scarf.sh" + fi + echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" + curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ + {"userQuery":"roxedus","permissionLevel":"admin"},\ + {"userQuery":"nemchik","permissionLevel":"admin"},\ + {"userQuery":"driz","permissionLevel":"admin"},\ + {"userQuery":"aptalca","permissionLevel":"admin"},\ + {"userQuery":"saarg","permissionLevel":"admin"},\ + {"userQuery":"Stark","permissionLevel":"admin"}]' + ''' + } + } /* ############### Build Container ############### */ @@ -386,7 +449,7 @@ pipeline { stage('Build-Single') { when { expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' } environment name: 'EXIT_STATUS', value: '' } @@ -680,6 +743,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -688,22 +757,26 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:development docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:development || : + ${DELETEIMAGE}:development \ + ${DELETEIMAGE}:${SEMVER} || : done ''' } @@ -722,6 +795,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -730,13 +809,14 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do + 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} @@ -746,6 +826,9 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -755,6 +838,9 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest push --purge ${MANIFESTIMAGE}:development || : docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm @@ -767,24 +853,32 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-development \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-development \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-development \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 910e551007088bc61de992ff96442f9fb3ed53bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 06:40:56 +0200 Subject: [PATCH 215/525] Bot Updating Templated Files --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fc0eec3..d462015 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bazarr/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bazarr) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) @@ -46,7 +47,7 @@ Find us at: Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `ghcr.io/linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -72,7 +73,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: bazarr: - image: ghcr.io/linuxserver/bazarr + image: lscr.io/linuxserver/bazarr container_name: bazarr environment: - PUID=1000 @@ -100,7 +101,7 @@ docker run -d \ -v :/movies \ -v Date: Tue, 5 Oct 2021 09:11:38 +0200 Subject: [PATCH 216/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 00be191..048664f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -113,7 +113,7 @@ skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 ssl_client-1.32.1-r6 -tzdata-2021b-r0 +tzdata-2021c-r0 unrar-6.0.3-r0 unzip-6.0-r9 utmps-0.1.0.0-r0 From f4881bea48c3db432bad383ff57cb3592a6af02a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Oct 2021 08:58:39 +0200 Subject: [PATCH 217/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 048664f..11d0ea5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ alpine-baselayout-3.2.0-r8 -alpine-keys-2.2-r0 +alpine-keys-2.4-r0 alsa-lib-1.2.4-r2 aom-libs-1.0.0-r1 apk-tools-2.12.7-r0 @@ -113,7 +113,7 @@ skalibs-2.10.0.0-r0 soxr-0.1.3-r2 sqlite-libs-3.34.1-r0 ssl_client-1.32.1-r6 -tzdata-2021c-r0 +tzdata-2021d-r0 unrar-6.0.3-r0 unzip-6.0-r9 utmps-0.1.0.0-r0 From 24bf572d365db413a6699fc0eb62c2c354b5793b Mon Sep 17 00:00:00 2001 From: Evert Hessel Date: Fri, 22 Oct 2021 20:40:05 +0200 Subject: [PATCH 218/525] Install openblas to fix numpy dependency error --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + readme-vars.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8d2a551..8f260e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + openblas \ py3-pip \ python3 \ unrar \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0ecc990..3d2916f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -27,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + openblas \ py3-pip \ python3 \ unrar \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5fe0c9d..1b9ae2b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -27,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + openblas \ py3-pip \ python3 \ unrar \ diff --git a/readme-vars.yml b/readme-vars.yml index db93694..01ad1c2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "22.10.21:", desc: "Added openblas package to prevent numpy error." } - { date: "16.05.21:", desc: "Use wheel index." } - { date: "19.04.21:", desc: "Install from release zip." } - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin." } From 42d4ae6bb5c2cefe39616b7b0707138765fcd689 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 12:48:23 +0200 Subject: [PATCH 219/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d462015..0a9bb2e 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **22.10.21:** - Added openblas package to prevent numpy error. * **16.05.21:** - Use wheel index. * **19.04.21:** - Install from release zip. * **07.04.21:** - Move app to /app/bazarr/bin. From 82ffe979d2b20a58ac4a466e9a983323b9ce1423 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 12:52:32 +0200 Subject: [PATCH 220/525] Bot Updating Package Versions --- package_versions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 11d0ea5..02c5277 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -37,6 +37,7 @@ libdrm-2.4.104-r0 libffi-3.3-r2 libgcc-10.2.1_pre1-r3 libgcrypt-1.8.8-r1 +libgfortran-10.2.1_pre1-r3 libgomp-10.2.1_pre1-r3 libgpg-error-1.41-r0 libintl-0.20.2-r2 @@ -46,6 +47,7 @@ libogg-1.3.4-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 +libquadmath-10.2.1_pre1-r3 libsrt-1.4.2-r0 libssh-0.9.5-r0 libssl1.1-1.1.1l-r0 @@ -74,6 +76,7 @@ ncurses-libs-6.2_p20210109-r0 ncurses-terminfo-base-6.2_p20210109-r0 nettle-3.7.3-r0 nghttp2-libs-1.42.0-r1 +openblas-0.3.13-r0 opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 From 1bf2ce9f6154cbd82fa155ab5e334a28adb19317 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 25 Oct 2021 15:46:42 -0400 Subject: [PATCH 221/525] rebase to 3.14, fix numpy wheel upstream --- Dockerfile | 3 +-- Dockerfile.aarch64 | 3 +-- Dockerfile.armhf | 3 +-- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f260e5..8dd78f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.13 +FROM ghcr.io/linuxserver/baseimage-alpine:3.14 # set version label ARG BUILD_DATE @@ -27,7 +27,6 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ - openblas \ py3-pip \ python3 \ unrar \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3d2916f..822b2c4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 # set version label ARG BUILD_DATE @@ -27,7 +27,6 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ - openblas \ py3-pip \ python3 \ unrar \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1b9ae2b..4cf9628 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -27,7 +27,6 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ - openblas \ py3-pip \ python3 \ unrar \ diff --git a/README.md b/README.md index 0a9bb2e..31d8fd1 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. * **22.10.21:** - Added openblas package to prevent numpy error. * **16.05.21:** - Use wheel index. * **19.04.21:** - Install from release zip. diff --git a/readme-vars.yml b/readme-vars.yml index 01ad1c2..a2cfc11 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." } - { date: "22.10.21:", desc: "Added openblas package to prevent numpy error." } - { date: "16.05.21:", desc: "Use wheel index." } - { date: "19.04.21:", desc: "Install from release zip." } From eeb88d9b01017cbba3e0afeeb2c901267a8b6749 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Oct 2021 14:06:30 +0200 Subject: [PATCH 222/525] Bot Updating Package Versions --- package_versions.txt | 174 +++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 02c5277..08b96a8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,130 +1,130 @@ -alpine-baselayout-3.2.0-r8 +alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 -alsa-lib-1.2.4-r2 -aom-libs-1.0.0-r1 +alsa-lib-1.2.5-r2 +aom-libs-1.0.0-r3 apk-tools-2.12.7-r0 -bash-5.1.0-r0 -brotli-libs-1.0.9-r3 -busybox-1.32.1-r6 +bash-5.1.4-r0 +brotli-libs-1.0.9-r5 +busybox-1.33.1-r3 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.2.10-r1 -ffmpeg-4.3.1-r4 -ffmpeg-libs-4.3.1-r4 -fontconfig-2.13.1-r3 +expat-2.4.1-r0 +ffmpeg-4.4-r1 +ffmpeg-libs-4.4-r1 +fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 -glib-2.66.8-r0 +glib-2.68.3-r0 gmp-6.2.1-r0 gnutls-3.7.1-r0 graphite2-1.3.14-r0 -harfbuzz-2.7.4-r1 +harfbuzz-2.8.1-r0 lame-3.100-r0 libacl-2.2.53-r0 -libass-0.15.0-r0 -libattr-2.4.48-r0 -libblkid-2.36.1-r1 -libbsd-0.10.0-r0 +libass-0.15.1-r0 +libattr-2.5.1-r0 +libblkid-2.37-r0 +libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 libcurl-7.79.1-r0 -libdav1d-0.8.1-r0 -libdrm-2.4.104-r0 +libdav1d-0.9.0-r0 +libdrm-2.4.106-r0 libffi-3.3-r2 -libgcc-10.2.1_pre1-r3 -libgcrypt-1.8.8-r1 -libgfortran-10.2.1_pre1-r3 -libgomp-10.2.1_pre1-r3 -libgpg-error-1.41-r0 -libintl-0.20.2-r2 +libgcc-10.3.1_git20210424-r2 +libgcrypt-1.9.4-r0 +libgomp-10.3.1_git20210424-r2 +libgpg-error-1.42-r0 +libintl-0.21-r0 libjpeg-turbo-2.1.0-r0 -libmount-2.36.1-r1 -libogg-1.3.4-r0 +libmd-1.0.3-r0 +libmount-2.37-r0 +libogg-1.3.5-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libproc-3.3.16-r0 -libquadmath-10.2.1_pre1-r3 +libproc-3.3.17-r0 +libretls-3.3.3p1-r2 libsrt-1.4.2-r0 -libssh-0.9.5-r0 +libssh-0.9.6-r0 libssl1.1-1.1.1l-r0 -libstdc++-10.2.1_pre1-r3 -libtasn1-4.16.0-r1 +libstdc++-10.3.1_git20210424-r2 +libtasn1-4.17.0-r0 libtheora-1.1.1-r16 -libtls-standalone-2.9.1-r1 -libunistring-0.9.10-r0 -libuuid-2.36.1-r1 -libva-2.10.0-r0 +libunistring-0.9.10-r1 +libuuid-2.37-r0 +libva-2.11.0-r0 libvdpau-1.4-r0 libvorbis-1.3.7-r0 -libvpx-1.9.0-r0 -libx11-1.7.1-r0 +libvpx-1.10.0-r0 +libwebp-1.2.0-r2 +libx11-1.7.2-r0 libxau-1.0.9-r0 -libxcb-1.14-r1 +libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxfixes-5.0.3-r2 -libxml2-2.9.12-r0 -libxslt-1.1.34-r0 -linux-pam-1.5.1-r0 -musl-1.2.2-r1 -musl-utils-1.2.2-r1 -ncurses-libs-6.2_p20210109-r0 -ncurses-terminfo-base-6.2_p20210109-r0 +libxfixes-6.0.0-r0 +libxml2-2.9.12-r1 +libxslt-1.1.34-r1 +linux-pam-1.5.1-r1 +mpdecimal-2.5.1-r1 +musl-1.2.2-r3 +musl-utils-1.2.2-r3 +ncurses-libs-6.2_p20210612-r0 +ncurses-terminfo-base-6.2_p20210612-r0 nettle-3.7.3-r0 -nghttp2-libs-1.42.0-r1 -openblas-0.3.13-r0 +nghttp2-libs-1.43.0-r0 opus-1.3.1-r1 p11-kit-0.23.22-r0 pcre-8.44-r0 -procps-3.3.16-r0 -py3-appdirs-1.4.4-r1 -py3-cachecontrol-0.12.6-r0 -py3-chardet-4.0.0-r0 -py3-colorama-0.4.4-r0 -py3-contextlib2-0.6.0-r0 -py3-distlib-0.3.1-r1 -py3-distro-1.5.0-r1 -py3-html5lib-1.1-r0 -py3-idna-3.1-r0 -py3-lockfile-0.12.2-r3 -py3-msgpack-1.0.2-r0 -py3-ordered-set-4.0.2-r0 -py3-packaging-20.9-r0 -py3-parsing-2.4.7-r1 -py3-pep517-0.9.1-r0 -py3-pip-20.3.4-r0 -py3-progress-1.5-r0 -py3-pytoml-0.1.21-r0 -py3-requests-2.25.1-r1 -py3-retrying-1.3.3-r0 -py3-setuptools-51.3.3-r0 -py3-six-1.15.0-r0 -py3-toml-0.10.2-r0 -py3-urllib3-1.26.2-r1 -py3-webencodings-0.5.1-r3 -python3-3.8.10-r0 +procps-3.3.17-r0 +py3-appdirs-1.4.4-r2 +py3-cachecontrol-0.12.6-r1 +py3-certifi-2020.12.5-r1 +py3-chardet-4.0.0-r2 +py3-colorama-0.4.4-r1 +py3-contextlib2-0.6.0-r1 +py3-distlib-0.3.1-r3 +py3-distro-1.5.0-r3 +py3-html5lib-1.1-r1 +py3-idna-3.2-r0 +py3-lockfile-0.12.2-r4 +py3-msgpack-1.0.2-r1 +py3-ordered-set-4.0.2-r1 +py3-packaging-20.9-r1 +py3-parsing-2.4.7-r2 +py3-pep517-0.10.0-r2 +py3-pip-20.3.4-r1 +py3-progress-1.5-r2 +py3-requests-2.25.1-r4 +py3-retrying-1.3.3-r1 +py3-setuptools-52.0.0-r3 +py3-six-1.15.0-r1 +py3-toml-0.10.2-r2 +py3-urllib3-1.26.5-r0 +py3-webencodings-0.5.1-r4 +python3-3.9.5-r1 readline-8.1.0-r0 -s6-ipcserver-2.10.0.0-r0 -scanelf-1.2.8-r0 -sdl2-2.0.14-r0 +s6-ipcserver-2.10.0.3-r0 +scanelf-1.3.2-r0 +sdl2-2.0.14-r1 shadow-4.8.1-r0 -skalibs-2.10.0.0-r0 +skalibs-2.10.0.3-r0 soxr-0.1.3-r2 -sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r6 -tzdata-2021d-r0 -unrar-6.0.3-r0 +sqlite-libs-3.35.5-r0 +ssl_client-1.33.1-r3 +tzdata-2021e-r0 +unrar-6.0.7-r0 unzip-6.0-r9 -utmps-0.1.0.0-r0 +utmps-0.1.0.2-r0 v4l-utils-libs-1.20.0-r0 vidstab-1.1.0-r1 -vulkan-loader-1.2.137-r0 -wayland-libs-client-1.18.0-r5 -x264-libs-20191119-r1 +vulkan-loader-1.2.170-r1 +wayland-libs-client-1.19.0-r0 +x264-libs-20210211-r0 x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r0 From e43dea4cb7398ca5d2f04ffe2f2c35b445bfa82c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Oct 2021 08:58:58 +0200 Subject: [PATCH 223/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 08b96a8..a41ff1e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,8 +11,8 @@ ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 curl-7.79.1-r0 expat-2.4.1-r0 -ffmpeg-4.4-r1 -ffmpeg-libs-4.4-r1 +ffmpeg-4.4.1-r0 +ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 From bd3626dbcf0f9d10b919d76e065178b4cc93f572 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Nov 2021 08:12:05 +0100 Subject: [PATCH 224/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a41ff1e..f9f465c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ lame-3.100-r0 libacl-2.2.53-r0 libass-0.15.1-r0 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.2-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -42,7 +42,7 @@ libgpg-error-1.42-r0 libintl-0.21-r0 libjpeg-turbo-2.1.0-r0 libmd-1.0.3-r0 -libmount-2.37-r0 +libmount-2.37.2-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 @@ -55,7 +55,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37-r0 +libuuid-2.37.2-r0 libva-2.11.0-r0 libvdpau-1.4-r0 libvorbis-1.3.7-r0 From 22d8c3d43d0f20ace71be9dfb9f93320604cceee Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 15 Nov 2021 10:10:14 -0500 Subject: [PATCH 225/525] compile lxml on amd64 to avoif broken wheel --- Dockerfile | 1 + README.md | 1 + readme-vars.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8dd78f5..d752624 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,7 @@ RUN \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install -U --no-cache-dir pip && \ + pip install lxml --no-binary :all: && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ diff --git a/README.md b/README.md index 31d8fd1..e2cb274 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.11.21:** - Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken. * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. * **22.10.21:** - Added openblas package to prevent numpy error. * **16.05.21:** - Use wheel index. diff --git a/readme-vars.yml b/readme-vars.yml index a2cfc11..648e0b7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." } - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." } - { date: "22.10.21:", desc: "Added openblas package to prevent numpy error." } - { date: "16.05.21:", desc: "Use wheel index." } From 1643c2a17e03c849318d0b81c8119c1b6e8c7778 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Nov 2021 03:34:11 +0100 Subject: [PATCH 226/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f9f465c..0e46ef3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ aom-libs-1.0.0-r3 apk-tools-2.12.7-r0 bash-5.1.4-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r3 +busybox-1.33.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 @@ -115,7 +115,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 soxr-0.1.3-r2 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r3 +ssl_client-1.33.1-r6 tzdata-2021e-r0 unrar-6.0.7-r0 unzip-6.0-r9 From 0a2ac0bdddbbb8d58b47292e3b2979ada2e017a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Nov 2021 05:47:26 +0100 Subject: [PATCH 227/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0e46ef3..4e3e6ac 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ py3-six-1.15.0-r1 py3-toml-0.10.2-r2 py3-urllib3-1.26.5-r0 py3-webencodings-0.5.1-r4 -python3-3.9.5-r1 +python3-3.9.5-r2 readline-8.1.0-r0 s6-ipcserver-2.10.0.3-r0 scanelf-1.3.2-r0 From 48fb9b6fb686d85524a7bc50d908946e186c4bf1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 05:43:31 +0100 Subject: [PATCH 228/525] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a122a5..4cd0d04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,12 +128,11 @@ pipeline { script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() - env.SEMVER = (new Date()).format('YYYY.MM.dd') - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ if (semver.find()) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ if (semver.find()) { if (semver[0][3]) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" @@ -143,7 +142,15 @@ pipeline { } } - println("SEMVER: ${env.SEMVER}") + if (env.SEMVER != null) { + if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" + } + println("SEMVER: ${env.SEMVER}") + } else { + println("No SEMVER detected") + } + } } } @@ -412,10 +419,10 @@ pipeline { steps{ sh '''#! /bin/bash set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid') if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" - PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ -H "Authorization: Bearer ${SCARF_TOKEN}" \ -H "Content-Type: application/json" \ -d '{"name":"linuxserver/bazarr",\ @@ -423,22 +430,10 @@ pipeline { "libraryType":"docker",\ "website":"https://github.com/linuxserver/docker-bazarr",\ "backendUrl":"https://ghcr.io/linuxserver/bazarr",\ - "publicUrl":"https://lscr.io/linuxserver/bazarr"}' \ - | jq -r .uuid) + "publicUrl":"https://lscr.io/linuxserver/bazarr"}' || : else echo "Package already exists on Scarf.sh" fi - echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" - curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ - {"userQuery":"roxedus","permissionLevel":"admin"},\ - {"userQuery":"nemchik","permissionLevel":"admin"},\ - {"userQuery":"driz","permissionLevel":"admin"},\ - {"userQuery":"aptalca","permissionLevel":"admin"},\ - {"userQuery":"saarg","permissionLevel":"admin"},\ - {"userQuery":"Stark","permissionLevel":"admin"}]' ''' } } @@ -762,11 +757,15 @@ pipeline { docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + fi docker push ${PUSHIMAGE}:development docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${PUSHIMAGE}:${SEMVER} + fi done ''' } @@ -775,8 +774,10 @@ pipeline { docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:development \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:development || : + if [ -n "${SEMVER}" ]; then + docker rmi ${DELETEIMAGE}:${SEMVER} || : + fi done ''' } @@ -826,9 +827,11 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + 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} @@ -838,9 +841,11 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker manifest push --purge ${MANIFESTIMAGE}:development || : docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm @@ -853,14 +858,18 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + fi docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + fi done ''' } @@ -870,15 +879,18 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-development \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-development \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-development \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + if [ -n "${SEMVER}" ]; then + docker rmi \ + ${DELETEIMAGE}:amd64-${SEMVER} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : + fi done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From a8d1c5cd48e129b019262f9d04b3757beab1a2bd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 05:44:48 +0100 Subject: [PATCH 229/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e2cb274..3ae0758 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Find us at: # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbazarr?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fbazarr) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) From 1175593c59829134b8140c4398b00431a3d2a4b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 17 Jan 2022 08:03:54 +0100 Subject: [PATCH 230/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4e3e6ac..7edc52e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.4.1-r0 +expat-2.4.3-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 From f703c00928142bd4b0fb0e0857b7bd328627bc15 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Jan 2022 08:00:14 +0100 Subject: [PATCH 231/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7edc52e..10d0896 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,8 +6,8 @@ apk-tools-2.12.7-r0 bash-5.1.4-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r6 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 curl-7.79.1-r0 expat-2.4.3-r0 From 5033de0769c6b636fd04ed53e7d2a052a8b73be9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Feb 2022 07:59:22 +0100 Subject: [PATCH 232/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 10d0896..c4a38ac 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.4.3-r0 +expat-2.4.4-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 @@ -26,7 +26,7 @@ lame-3.100-r0 libacl-2.2.53-r0 libass-0.15.1-r0 libattr-2.5.1-r0 -libblkid-2.37.2-r0 +libblkid-2.37.3-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -42,7 +42,7 @@ libgpg-error-1.42-r0 libintl-0.21-r0 libjpeg-turbo-2.1.0-r0 libmd-1.0.3-r0 -libmount-2.37.2-r0 +libmount-2.37.3-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 @@ -55,7 +55,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37.2-r0 +libuuid-2.37.3-r0 libva-2.11.0-r0 libvdpau-1.4-r0 libvorbis-1.3.7-r0 From 78f1c56a4368a9913209e1a9309638da69196471 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Feb 2022 07:59:59 +0100 Subject: [PATCH 233/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c4a38ac..3d79088 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ lame-3.100-r0 libacl-2.2.53-r0 libass-0.15.1-r0 libattr-2.5.1-r0 -libblkid-2.37.3-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -42,7 +42,7 @@ libgpg-error-1.42-r0 libintl-0.21-r0 libjpeg-turbo-2.1.0-r0 libmd-1.0.3-r0 -libmount-2.37.3-r0 +libmount-2.37.4-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 @@ -55,7 +55,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37.3-r0 +libuuid-2.37.4-r0 libva-2.11.0-r0 libvdpau-1.4-r0 libvorbis-1.3.7-r0 From 510c0eada0f625dd277d46494747d08c6ed28bd9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Feb 2022 07:59:10 +0100 Subject: [PATCH 234/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3d79088..20143f2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.4.4-r0 +expat-2.4.5-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 From 54b0237e80e99a2c629d89b754e752814e50913d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Feb 2022 05:46:54 +0100 Subject: [PATCH 235/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 20143f2..3404b76 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.4.5-r0 +expat-2.4.6-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 From 1ac3b08a66305f56a7974651862d5e75a26bce39 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Mar 2022 08:00:49 +0100 Subject: [PATCH 236/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3404b76..062ba41 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 curl-7.79.1-r0 -expat-2.4.6-r0 +expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 @@ -18,7 +18,7 @@ freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 +gmp-6.2.1-r1 gnutls-3.7.1-r0 graphite2-1.3.14-r0 harfbuzz-2.8.1-r0 From d8f7b0153658d00dbadf8b1b4d88ec07e235ac40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Mar 2022 08:02:27 +0100 Subject: [PATCH 237/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 062ba41..05d0901 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -67,7 +67,7 @@ libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 libxslt-1.1.34-r1 linux-pam-1.5.1-r1 mpdecimal-2.5.1-r1 From 80c4e856718a5fa4882aac3f4fe0e98f1a7648fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Mar 2022 02:01:55 -0500 Subject: [PATCH 238/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 05d0901..d0c995c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -68,7 +68,7 @@ libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 libxml2-2.9.13-r0 -libxslt-1.1.34-r1 +libxslt-1.1.35-r0 linux-pam-1.5.1-r1 mpdecimal-2.5.1-r1 musl-1.2.2-r3 From 6a3d107f7e75c6e2f6fc36cc9b582f4af9dcd3ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Mar 2022 08:01:27 +0100 Subject: [PATCH 239/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d0c995c..faae696 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 aom-libs-1.0.0-r3 apk-tools-2.12.7-r0 -bash-5.1.4-r0 +bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r6 ca-certificates-20211220-r0 @@ -30,7 +30,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 @@ -50,7 +50,7 @@ libproc-3.3.17-r0 libretls-3.3.3p1-r2 libsrt-1.4.2-r0 libssh-0.9.6-r0 -libssl1.1-1.1.1l-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 @@ -116,7 +116,7 @@ skalibs-2.10.0.3-r0 soxr-0.1.3-r2 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r6 -tzdata-2021e-r0 +tzdata-2022a-r0 unrar-6.0.7-r0 unzip-6.0-r9 utmps-0.1.0.2-r0 From 501bf5b275df20cb3b2ec4da3eb74af94f3eea01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Mar 2022 09:02:42 +0200 Subject: [PATCH 240/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index faae696..0cc337b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,7 +47,7 @@ libogg-1.3.5-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 libproc-3.3.17-r0 -libretls-3.3.3p1-r2 +libretls-3.3.3p1-r3 libsrt-1.4.2-r0 libssh-0.9.6-r0 libssl1.1-1.1.1n-r0 @@ -129,4 +129,4 @@ x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r0 xz-libs-5.2.5-r0 -zlib-1.2.11-r3 +zlib-1.2.12-r0 From 4e045e2df66258acfc8e8bed83cdd7452b193f4f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Apr 2022 02:01:18 -0500 Subject: [PATCH 241/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0cc337b..76c08ed 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ aom-libs-1.0.0-r3 apk-tools-2.12.7-r0 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r6 +busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 @@ -115,7 +115,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 soxr-0.1.3-r2 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r6 +ssl_client-1.33.1-r7 tzdata-2022a-r0 unrar-6.0.7-r0 unzip-6.0-r9 From b325fabd5e496fef996d029610e312c5df19063f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Apr 2022 06:46:45 +0200 Subject: [PATCH 242/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 76c08ed..fbb4014 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,5 +128,5 @@ x264-libs-20210211-r0 x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r0 -xz-libs-5.2.5-r0 +xz-libs-5.2.5-r1 zlib-1.2.12-r0 From ba0cd56c48aeba9b039919b93fe5d9ec627548b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Apr 2022 02:01:49 -0500 Subject: [PATCH 243/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fbb4014..42784da 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -127,6 +127,6 @@ wayland-libs-client-1.19.0-r0 x264-libs-20210211-r0 x265-libs-3.4-r0 xvidcore-1.3.7-r1 -xz-5.2.5-r0 +xz-5.2.5-r1 xz-libs-5.2.5-r1 zlib-1.2.12-r0 From f2a9cc6ccde77e447461730d216bb7043205ba8c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Apr 2022 06:00:16 -0500 Subject: [PATCH 244/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 42784da..3c8fc43 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 -curl-7.79.1-r0 +curl-7.79.1-r1 expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 @@ -31,7 +31,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1n-r0 -libcurl-7.79.1-r0 +libcurl-7.79.1-r1 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 libffi-3.3-r2 From 79ffaebf6d80c345362fbce2583ca8482a9ad95f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 08:56:09 +0200 Subject: [PATCH 245/525] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4cd0d04..c5958f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,9 +353,11 @@ pipeline { if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 3f79a44f5591cd1d37d4c111005f28a13f370a17 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 08:57:20 +0200 Subject: [PATCH 246/525] Bot Updating Templated Files --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3ae0758..5f775c2 100644 --- a/README.md +++ b/README.md @@ -46,17 +46,17 @@ Find us at: ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/bazarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/bazarr:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Application Setup @@ -74,7 +74,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: bazarr: - image: lscr.io/linuxserver/bazarr + image: lscr.io/linuxserver/bazarr:development container_name: bazarr environment: - PUID=1000 @@ -102,7 +102,7 @@ docker run -d \ -v :/movies \ -v Date: Mon, 2 May 2022 01:58:03 -0500 Subject: [PATCH 247/525] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5958f4..9cca746 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -355,7 +355,7 @@ pipeline { if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, marking Unraid template as deprecated" cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml + git add -u unraid/${CONTAINER_NAME}.xml git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : git commit -m 'Bot Moving Deprecated Unraid Template' || : else From 27e765e5f2c1cf9fbc3dcf821843613fa3531091 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 7 May 2022 09:03:47 +0200 Subject: [PATCH 248/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3c8fc43..bb100a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 -freetype-2.10.4-r1 +freetype-2.10.4-r2 fribidi-1.0.10-r0 gdbm-1.19-r0 glib-2.68.3-r0 From b30785e240c3e2a7231f9922171aa9cb152fbaa0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 May 2022 02:06:21 -0500 Subject: [PATCH 249/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bb100a2..6c07a48 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -67,7 +67,7 @@ libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 -libxml2-2.9.13-r0 +libxml2-2.9.14-r0 libxslt-1.1.35-r0 linux-pam-1.5.1-r1 mpdecimal-2.5.1-r1 @@ -129,4 +129,4 @@ x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r0 +zlib-1.2.12-r1 From 2db6692833435e27c0c246118bdc40ed1c01f391 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 May 2022 09:05:24 +0200 Subject: [PATCH 250/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6c07a48..65098a7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1n-r0 +libcrypto1.1-1.1.1o-r0 libcurl-7.79.1-r1 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 @@ -50,7 +50,7 @@ libproc-3.3.17-r0 libretls-3.3.3p1-r3 libsrt-1.4.2-r0 libssh-0.9.6-r0 -libssl1.1-1.1.1n-r0 +libssl1.1-1.1.1o-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From 19d5b05b5b2ce980ab19a8a568204edb26a869ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 May 2022 09:06:07 +0200 Subject: [PATCH 251/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 65098a7..e9684e7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 -freetype-2.10.4-r2 +freetype-2.10.4-r3 fribidi-1.0.10-r0 gdbm-1.19-r0 glib-2.68.3-r0 From 2e0561e813c9115265e498b31a0e8ab400fb91d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Jul 2022 09:04:21 +0200 Subject: [PATCH 252/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e9684e7..e1f7847 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 -curl-7.79.1-r1 +curl-7.79.1-r2 expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 @@ -31,7 +31,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1o-r0 -libcurl-7.79.1-r1 +libcurl-7.79.1-r2 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 libffi-3.3-r2 From e4ca7fac56714c0f98ba9304a158938661a6213b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Jul 2022 02:02:00 -0500 Subject: [PATCH 253/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e1f7847..5231a77 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1o-r0 +libcrypto1.1-1.1.1p-r0 libcurl-7.79.1-r2 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 @@ -50,7 +50,7 @@ libproc-3.3.17-r0 libretls-3.3.3p1-r3 libsrt-1.4.2-r0 libssh-0.9.6-r0 -libssl1.1-1.1.1o-r0 +libssl1.1-1.1.1p-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From 04f4e8a46ddee5211d60db279bffb5ac263f26ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Jul 2022 09:03:44 +0200 Subject: [PATCH 254/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5231a77..0a2ea67 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -30,7 +30,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1p-r0 +libcrypto1.1-1.1.1q-r0 libcurl-7.79.1-r2 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 @@ -50,7 +50,7 @@ libproc-3.3.17-r0 libretls-3.3.3p1-r3 libsrt-1.4.2-r0 libssh-0.9.6-r0 -libssl1.1-1.1.1p-r0 +libssl1.1-1.1.1q-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From d7381ece6b8005a211dd83335d4ca59c6dfdef29 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Jul 2022 09:06:50 +0200 Subject: [PATCH 255/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0a2ea67..cd16cb1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -73,8 +73,8 @@ linux-pam-1.5.1-r1 mpdecimal-2.5.1-r1 musl-1.2.2-r3 musl-utils-1.2.2-r3 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 +ncurses-libs-6.2_p20210612-r1 +ncurses-terminfo-base-6.2_p20210612-r1 nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 opus-1.3.1-r1 From 8ef5f41090abbe950242a6b170eea1ce5a4886a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Jul 2022 09:52:54 +0200 Subject: [PATCH 256/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cd16cb1..0a30fd1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ aom-libs-1.0.0-r3 apk-tools-2.12.7-r0 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r7 +busybox-1.33.1-r8 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 @@ -115,7 +115,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 soxr-0.1.3-r2 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r7 +ssl_client-1.33.1-r8 tzdata-2022a-r0 unrar-6.0.7-r0 unzip-6.0-r9 From a9b75d301451f6b7d1512c0d320aeff726219311 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 31 Jul 2022 06:58:29 +0200 Subject: [PATCH 257/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0a30fd1..f9a4137 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,7 +19,7 @@ fribidi-1.0.10-r0 gdbm-1.19-r0 glib-2.68.3-r0 gmp-6.2.1-r1 -gnutls-3.7.1-r0 +gnutls-3.7.1-r1 graphite2-1.3.14-r0 harfbuzz-2.8.1-r0 lame-3.100-r0 From 1df2fd15676d6a6c210a8cfe989362a95b73afa0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Aug 2022 02:04:03 -0500 Subject: [PATCH 258/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f9a4137..ec83390 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,8 +6,8 @@ apk-tools-2.12.7-r0 bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r8 -ca-certificates-20211220-r0 -ca-certificates-bundle-20211220-r0 +ca-certificates-20220614-r0 +ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 curl-7.79.1-r2 expat-2.4.7-r0 From b4552926e9863d1fe9533c6129fa112aa8679b75 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 7 Aug 2022 06:51:27 +0200 Subject: [PATCH 259/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ec83390..56d1456 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,4 +129,4 @@ x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r1 +zlib-1.2.12-r2 From 583ce1bc4a4833fe070ecfc8c51f2958c4b3507e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Aug 2022 02:03:06 -0500 Subject: [PATCH 260/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 56d1456..92f842c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,4 +129,4 @@ x265-libs-3.4-r0 xvidcore-1.3.7-r1 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r2 +zlib-1.2.12-r3 From 2f49b7c3f622c476564274a3c9b58c5a694753bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Aug 2022 06:58:55 +0200 Subject: [PATCH 261/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 92f842c..8aa2e8f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -67,7 +67,7 @@ libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 -libxml2-2.9.14-r0 +libxml2-2.9.14-r1 libxslt-1.1.35-r0 linux-pam-1.5.1-r1 mpdecimal-2.5.1-r1 From a746d16721a9851b8244f89ac048b7b980cbfcc1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Aug 2022 02:08:50 -0500 Subject: [PATCH 262/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8aa2e8f..9066f3d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -116,7 +116,7 @@ skalibs-2.10.0.3-r0 soxr-0.1.3-r2 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r8 -tzdata-2022a-r0 +tzdata-2022c-r0 unrar-6.0.7-r0 unzip-6.0-r9 utmps-0.1.0.2-r0 From 4113cb66e61d50ad815e3578a1c2ef3059b05f72 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Sep 2022 02:03:09 -0500 Subject: [PATCH 263/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9066f3d..50732c7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ busybox-1.33.1-r8 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 -curl-7.79.1-r2 +curl-7.79.1-r3 expat-2.4.7-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 @@ -31,7 +31,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.79.1-r2 +libcurl-7.79.1-r3 libdav1d-0.9.0-r0 libdrm-2.4.106-r0 libffi-3.3-r2 From cf3c8dcfe2621fec155ca09b3e773ad38a9d47a7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 17 Sep 2022 02:00:30 -0500 Subject: [PATCH 264/525] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cca746..b78db72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } From 0e2e615e2ca78e78e82e6f89c8bd8cea52c11507 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Sep 2022 02:28:09 -0500 Subject: [PATCH 265/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 50732c7..b427173 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 curl-7.79.1-r3 -expat-2.4.7-r0 +expat-2.4.9-r0 ffmpeg-4.4.1-r0 ffmpeg-libs-4.4.1-r0 fontconfig-2.13.1-r4 From a9632c2d5a930fd6e9c81306d5e7d49582d45396 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Oct 2022 09:35:34 +0200 Subject: [PATCH 266/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b427173..31468e2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,7 +61,7 @@ libvdpau-1.4-r0 libvorbis-1.3.7-r0 libvpx-1.10.0-r0 libwebp-1.2.0-r2 -libx11-1.7.2-r0 +libx11-1.7.3.1-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 From 6b43274223ca0deac3caa238b3f281b94a577cf9 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 11 Oct 2022 14:24:28 +0100 Subject: [PATCH 267/525] Migrate to s6v3 --- Dockerfile | 23 ++++++++++++++----- Dockerfile.aarch64 | 22 ++++++++++++++---- Dockerfile.armhf | 22 ++++++++++++++---- Jenkinsfile | 2 +- README.md | 14 +++++------ jenkins-vars.yml | 2 +- readme-vars.yml | 8 +++---- .../dependencies.d/init-config | 0 .../s6-rc.d/init-bazarr-config/run} | 0 .../s6-rc.d/init-bazarr-config/type | 1 + .../s6-overlay/s6-rc.d/init-bazarr-config/up | 1 + .../dependencies.d/init-bazarr-config | 0 .../svc-bazarr/dependencies.d/init-services | 0 .../s6-rc.d/svc-bazarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-bazarr/run | 5 ++++ root/etc/s6-overlay/s6-rc.d/svc-bazarr/type | 1 + .../user/contents.d/init-bazarr-config | 0 .../s6-rc.d/user/contents.d/svc-bazarr | 0 root/etc/services.d/bazarr/run | 10 -------- 19 files changed, 73 insertions(+), 39 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-bazarr-config/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-bazarr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr delete mode 100644 root/etc/services.d/bazarr/run diff --git a/Dockerfile b/Dockerfile index d752624..faa87ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label +ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -20,17 +21,27 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ + make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ - curl \ ffmpeg \ libxml2 \ libxslt \ py3-pip \ python3 \ - unrar \ unzip && \ + echo "**** install unrar from source ****" && \ + mkdir /tmp/unrar && \ + curl -o \ + /tmp/unrar.tar.gz -L \ + "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ + tar xf \ + /tmp/unrar.tar.gz -C \ + /tmp/unrar --strip-components=1 && \ + cd /tmp/unrar && \ + make && \ + install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ @@ -45,11 +56,10 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install -U --no-cache-dir pip && \ - pip install lxml --no-binary :all: && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ @@ -64,4 +74,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 822b2c4..e5be544 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,7 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 # set version label +ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -20,17 +21,27 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ + make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ - curl \ ffmpeg \ libxml2 \ libxslt \ py3-pip \ python3 \ - unrar \ unzip && \ + echo "**** install unrar from source ****" && \ + mkdir /tmp/unrar && \ + curl -o \ + /tmp/unrar.tar.gz -L \ + "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ + tar xf \ + /tmp/unrar.tar.gz -C \ + /tmp/unrar --strip-components=1 && \ + cd /tmp/unrar && \ + make && \ + install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ @@ -45,10 +56,10 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install -U --no-cache-dir pip && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ @@ -63,4 +74,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4cf9628..fbeba44 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,6 +1,7 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 # set version label +ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -20,17 +21,27 @@ RUN \ libffi-dev \ libxml2-dev \ libxslt-dev \ + make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ - curl \ ffmpeg \ libxml2 \ libxslt \ py3-pip \ python3 \ - unrar \ unzip && \ + echo "**** install unrar from source ****" && \ + mkdir /tmp/unrar && \ + curl -o \ + /tmp/unrar.tar.gz -L \ + "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ + tar xf \ + /tmp/unrar.tar.gz -C \ + /tmp/unrar --strip-components=1 && \ + cd /tmp/unrar && \ + make && \ + install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ @@ -45,10 +56,10 @@ RUN \ /tmp/bazarr.zip -d \ /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \ + echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ pip3 install -U --no-cache-dir pip && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ @@ -63,4 +74,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index b78db72..5890aeb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { CI_DELAY='120' CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='user:password' - CI_WEBPATH='' + CI_WEBPATH='/system/status' } stages { // Setup all the basic environment variables needed for the build diff --git a/README.md b/README.md index 5f775c2..9ff725d 100644 --- a/README.md +++ b/README.md @@ -81,9 +81,9 @@ services: - PGID=1000 - TZ=Europe/London volumes: - - :/config - - :/movies - - :/config \ - -v :/movies \ - -v ", desc: "Bazarr data" } - - { vol_path: "/movies", vol_host_path: "", desc: "Location of your movies" } - - { vol_path: "/tv", vol_host_path: " Date: Wed, 12 Oct 2022 21:52:45 +0200 Subject: [PATCH 268/525] Bot Updating Package Versions --- package_versions.txt | 202 +++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 103 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 31468e2..fd282f2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,131 +1,127 @@ -alpine-baselayout-3.2.0-r16 -alpine-keys-2.4-r0 -alsa-lib-1.2.5-r2 -aom-libs-1.0.0-r3 -apk-tools-2.12.7-r0 -bash-5.1.16-r0 -brotli-libs-1.0.9-r5 -busybox-1.33.1-r8 +alpine-baselayout-3.2.0-r23 +alpine-baselayout-data-3.2.0-r23 +alpine-keys-2.4-r1 +alsa-lib-1.2.7.2-r0 +aom-libs-3.3.0-r0 +apk-tools-2.12.9-r3 +bash-5.1.16-r2 +brotli-libs-1.0.9-r6 +busybox-1.35.0-r17 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 -coreutils-8.32-r2 -curl-7.79.1-r3 +cjson-1.7.15-r3 +coreutils-9.1-r0 +curl-7.83.1-r3 +dbus-libs-1.14.4-r0 expat-2.4.9-r0 -ffmpeg-4.4.1-r0 -ffmpeg-libs-4.4.1-r0 -fontconfig-2.13.1-r4 -freetype-2.10.4-r3 -fribidi-1.0.10-r0 -gdbm-1.19-r0 -glib-2.68.3-r0 -gmp-6.2.1-r1 -gnutls-3.7.1-r1 -graphite2-1.3.14-r0 -harfbuzz-2.8.1-r0 +ffmpeg-5.0.1-r1 +ffmpeg-libs-5.0.1-r1 +flac-1.3.4-r0 +fontconfig-2.14.0-r0 +freetype-2.12.1-r0 +fribidi-1.0.12-r0 +gdbm-1.23-r0 +glib-2.72.1-r0 +gmp-6.2.1-r2 +gnutls-3.7.7-r0 +graphite2-1.3.14-r1 +harfbuzz-4.3.0-r0 +jq-1.6-r1 lame-3.100-r0 -libacl-2.2.53-r0 -libass-0.15.1-r0 -libattr-2.5.1-r0 -libblkid-2.37.4-r0 -libbsd-0.11.3-r0 +libacl-2.3.1-r0 +libass-0.16.0-r0 +libasyncns-0.8-r1 +libattr-2.5.1-r1 +libblkid-2.38-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.79.1-r3 -libdav1d-0.9.0-r0 -libdrm-2.4.106-r0 -libffi-3.3-r2 -libgcc-10.3.1_git20210424-r2 -libgcrypt-1.9.4-r0 -libgomp-10.3.1_git20210424-r2 -libgpg-error-1.42-r0 -libintl-0.21-r0 -libjpeg-turbo-2.1.0-r0 -libmd-1.0.3-r0 -libmount-2.37.4-r0 -libogg-1.3.5-r0 +libcurl-7.83.1-r3 +libdav1d-1.0.0-r0 +libdrm-2.4.110-r0 +libffi-3.4.2-r1 +libgcc-11.2.1_git20220219-r2 +libgcrypt-1.10.1-r0 +libgomp-11.2.1_git20220219-r2 +libgpg-error-1.45-r0 +libintl-0.21-r2 +libjpeg-turbo-2.1.3-r1 +libltdl-2.4.7-r0 +libmount-2.38-r1 +libogg-1.3.5-r1 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libproc-3.3.17-r0 -libretls-3.3.3p1-r3 -libsrt-1.4.2-r0 -libssh-0.9.6-r0 +libproc-3.3.17-r1 +libpulse-15.0-r2 +librist-0.2.6-r1 +libsndfile-1.1.0-r0 +libsrt-1.4.4-r0 +libssh-0.9.6-r1 libssl1.1-1.1.1q-r0 -libstdc++-10.3.1_git20210424-r2 -libtasn1-4.17.0-r0 +libstdc++-11.2.1_git20220219-r2 +libtasn1-4.18.0-r0 libtheora-1.1.1-r16 -libunistring-0.9.10-r1 -libuuid-2.37.4-r0 -libva-2.11.0-r0 -libvdpau-1.4-r0 +libunistring-1.0-r0 +libva-2.14.0-r0 +libvdpau-1.5-r0 libvorbis-1.3.7-r0 -libvpx-1.10.0-r0 -libwebp-1.2.0-r2 -libx11-1.7.3.1-r0 +libvpx-1.11.0-r1 +libwebp-1.2.3-r0 +libx11-1.8-r0 libxau-1.0.9-r0 -libxcb-1.14-r2 +libxcb-1.15-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 libxml2-2.9.14-r1 libxslt-1.1.35-r0 -linux-pam-1.5.1-r1 +linux-pam-1.5.2-r0 +mbedtls-2.28.1-r0 mpdecimal-2.5.1-r1 -musl-1.2.2-r3 -musl-utils-1.2.2-r3 -ncurses-libs-6.2_p20210612-r1 -ncurses-terminfo-base-6.2_p20210612-r1 +musl-1.2.3-r0 +musl-utils-1.2.3-r0 +ncurses-libs-6.3_p20220521-r0 +ncurses-terminfo-base-6.3_p20220521-r0 nettle-3.7.3-r0 -nghttp2-libs-1.43.0-r0 +nghttp2-libs-1.47.0-r0 +numactl-2.0.14-r0 +oniguruma-6.9.8-r0 opus-1.3.1-r1 -p11-kit-0.23.22-r0 -pcre-8.44-r0 -procps-3.3.17-r0 -py3-appdirs-1.4.4-r2 -py3-cachecontrol-0.12.6-r1 -py3-certifi-2020.12.5-r1 -py3-chardet-4.0.0-r2 -py3-colorama-0.4.4-r1 -py3-contextlib2-0.6.0-r1 -py3-distlib-0.3.1-r3 -py3-distro-1.5.0-r3 -py3-html5lib-1.1-r1 -py3-idna-3.2-r0 -py3-lockfile-0.12.2-r4 -py3-msgpack-1.0.2-r1 -py3-ordered-set-4.0.2-r1 -py3-packaging-20.9-r1 -py3-parsing-2.4.7-r2 -py3-pep517-0.10.0-r2 -py3-pip-20.3.4-r1 -py3-progress-1.5-r2 -py3-requests-2.25.1-r4 -py3-retrying-1.3.3-r1 -py3-setuptools-52.0.0-r3 -py3-six-1.15.0-r1 -py3-toml-0.10.2-r2 -py3-urllib3-1.26.5-r0 -py3-webencodings-0.5.1-r4 -python3-3.9.5-r2 -readline-8.1.0-r0 -s6-ipcserver-2.10.0.3-r0 -scanelf-1.3.2-r0 -sdl2-2.0.14-r1 -shadow-4.8.1-r0 -skalibs-2.10.0.3-r0 +orc-0.4.32-r0 +p11-kit-0.24.1-r0 +pcre-8.45-r2 +procps-3.3.17-r1 +py3-appdirs-1.4.4-r3 +py3-contextlib2-21.6.0-r2 +py3-more-itertools-8.13.0-r0 +py3-ordered-set-4.0.2-r3 +py3-packaging-21.3-r0 +py3-parsing-2.4.7-r3 +py3-pep517-0.12.0-r2 +py3-pip-22.1.1-r0 +py3-retrying-1.3.3-r3 +py3-setuptools-59.4.0-r0 +py3-six-1.16.0-r1 +py3-tomli-2.0.1-r1 +python3-3.10.5-r0 +readline-8.1.2-r0 +scanelf-1.3.4-r0 +sdl2-2.0.22-r0 +shadow-4.10-r3 +skalibs-2.11.2.0-r0 soxr-0.1.3-r2 -sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r8 +speexdsp-1.2.0-r0 +sqlite-libs-3.38.5-r0 +ssl_client-1.35.0-r17 +tdb-libs-1.4.6-r0 tzdata-2022c-r0 -unrar-6.0.7-r0 unzip-6.0-r9 -utmps-0.1.0.2-r0 -v4l-utils-libs-1.20.0-r0 +utmps-libs-0.1.2.0-r0 +v4l-utils-libs-1.22.1-r1 vidstab-1.1.0-r1 -vulkan-loader-1.2.170-r1 -wayland-libs-client-1.19.0-r0 -x264-libs-20210211-r0 -x265-libs-3.4-r0 +wayland-libs-client-1.20.0-r0 +x264-libs-0.163_git20210613-r0 +x265-libs-3.5-r3 xvidcore-1.3.7-r1 xz-5.2.5-r1 xz-libs-5.2.5-r1 From 4861b2c60669372b08ec70a9c74ad63fd99a2706 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 16 Oct 2022 07:23:23 +0200 Subject: [PATCH 269/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fd282f2..b8ad1b8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -73,7 +73,7 @@ libxcb-1.15-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-6.0.0-r0 -libxml2-2.9.14-r1 +libxml2-2.9.14-r2 libxslt-1.1.35-r0 linux-pam-1.5.2-r0 mbedtls-2.28.1-r0 From 9a5b75d2abdd80782792f1189c8d2c5f4b482ae1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 26 Oct 2022 09:06:29 +0200 Subject: [PATCH 270/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b8ad1b8..c9ae355 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ cjson-1.7.15-r3 coreutils-9.1-r0 curl-7.83.1-r3 dbus-libs-1.14.4-r0 -expat-2.4.9-r0 +expat-2.5.0-r0 ffmpeg-5.0.1-r1 ffmpeg-libs-5.0.1-r1 flac-1.3.4-r0 From bb1ff9b0004ffdc74441aa6db9916cc51b49b4ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Nov 2022 07:19:04 +0100 Subject: [PATCH 271/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c9ae355..3b31586 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 cjson-1.7.15-r3 coreutils-9.1-r0 -curl-7.83.1-r3 +curl-7.83.1-r4 dbus-libs-1.14.4-r0 expat-2.5.0-r0 ffmpeg-5.0.1-r1 @@ -36,7 +36,7 @@ libblkid-2.38-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.83.1-r3 +libcurl-7.83.1-r4 libdav1d-1.0.0-r0 libdrm-2.4.110-r0 libffi-3.4.2-r1 From 1c3bc3f8567b68bf54855758edd6054f4567c4a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Nov 2022 07:59:00 +0100 Subject: [PATCH 272/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3b31586..5002696 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ libxslt-1.1.35-r0 linux-pam-1.5.2-r0 mbedtls-2.28.1-r0 mpdecimal-2.5.1-r1 -musl-1.2.3-r0 +musl-1.2.3-r1 musl-utils-1.2.3-r0 ncurses-libs-6.3_p20220521-r0 ncurses-terminfo-base-6.3_p20220521-r0 From a5be6b36f9a50b4969567eda20fc79fc15e2e9b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Nov 2022 01:00:43 -0600 Subject: [PATCH 273/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5002696..4a26221 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,7 +35,7 @@ libattr-2.5.1-r1 libblkid-2.38-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1q-r0 +libcrypto1.1-1.1.1s-r0 libcurl-7.83.1-r4 libdav1d-1.0.0-r0 libdrm-2.4.110-r0 @@ -57,7 +57,7 @@ librist-0.2.6-r1 libsndfile-1.1.0-r0 libsrt-1.4.4-r0 libssh-0.9.6-r1 -libssl1.1-1.1.1q-r0 +libssl1.1-1.1.1s-r0 libstdc++-11.2.1_git20220219-r2 libtasn1-4.18.0-r0 libtheora-1.1.1-r16 @@ -79,7 +79,7 @@ linux-pam-1.5.2-r0 mbedtls-2.28.1-r0 mpdecimal-2.5.1-r1 musl-1.2.3-r1 -musl-utils-1.2.3-r0 +musl-utils-1.2.3-r1 ncurses-libs-6.3_p20220521-r0 ncurses-terminfo-base-6.3_p20220521-r0 nettle-3.7.3-r0 @@ -114,7 +114,7 @@ speexdsp-1.2.0-r0 sqlite-libs-3.38.5-r0 ssl_client-1.35.0-r17 tdb-libs-1.4.6-r0 -tzdata-2022c-r0 +tzdata-2022f-r1 unzip-6.0-r9 utmps-libs-0.1.2.0-r0 v4l-utils-libs-1.22.1-r1 From 5dd2ace7ec57dece9a207cb2bacd36419be3872e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Nov 2022 08:01:40 +0100 Subject: [PATCH 274/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index d183e70..bffb2a7 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then From 4db46c62b788253659149b8f2b8180515357e479 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Nov 2022 08:08:23 +0100 Subject: [PATCH 275/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4a26221..15c8a7e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ py3-retrying-1.3.3-r3 py3-setuptools-59.4.0-r0 py3-six-1.16.0-r1 py3-tomli-2.0.1-r1 -python3-3.10.5-r0 +python3-3.10.8-r0 readline-8.1.2-r0 scanelf-1.3.4-r0 sdl2-2.0.22-r0 From e640dbb88fad4bfbfaa2388fedae98051a590a89 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Nov 2022 22:49:29 -0600 Subject: [PATCH 276/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 15c8a7e..36ca170 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ libxslt-1.1.35-r0 linux-pam-1.5.2-r0 mbedtls-2.28.1-r0 mpdecimal-2.5.1-r1 -musl-1.2.3-r1 +musl-1.2.3-r2 musl-utils-1.2.3-r1 ncurses-libs-6.3_p20220521-r0 ncurses-terminfo-base-6.3_p20220521-r0 From 09542a4f0d09d9283de38777e941c3a7188cd405 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Nov 2022 00:57:37 -0600 Subject: [PATCH 277/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 36ca170..135313f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ linux-pam-1.5.2-r0 mbedtls-2.28.1-r0 mpdecimal-2.5.1-r1 musl-1.2.3-r2 -musl-utils-1.2.3-r1 +musl-utils-1.2.3-r2 ncurses-libs-6.3_p20220521-r0 ncurses-terminfo-base-6.3_p20220521-r0 nettle-3.7.3-r0 From 1c6c16d6ba751379d95bf370acbb2f59627aba06 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 02:53:53 -0600 Subject: [PATCH 278/525] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5890aeb..d00c36b 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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.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 ./root/donate.txt' + 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 ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -287,7 +287,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" From e1b6e5feec0c95064329e48b66b4fdfc55fdbb9f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 02:55:21 -0600 Subject: [PATCH 279/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.md | 40 ------------------------- .github/ISSUE_TEMPLATE/issue.feature.md | 25 ---------------- 2 files changed, 65 deletions(-) delete mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md deleted file mode 100755 index 48aa3a0..0000000 --- a/.github/ISSUE_TEMPLATE/issue.bug.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md deleted file mode 100755 index 20a91fd..0000000 --- a/.github/ISSUE_TEMPLATE/issue.feature.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - - ------------------------------- - -## Desired Behavior - - -## Current Behavior - - -## Alternatives Considered - From ebf81a03347f68b479b58829c51c878393a3cbf4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 02:56:43 -0600 Subject: [PATCH 280/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 77 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.yml | 31 ++++++++ .github/workflows/external_trigger.yml | 2 +- .../workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/stale.yml | 2 +- 8 files changed, 114 insertions(+), 6 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.yml diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml new file mode 100755 index 0000000..59a10f5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -0,0 +1,77 @@ +# Based on the issue template +name: Bug report +description: Create a report to help us improve +title: "[BUG] " +labels: [Bug] +body: + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Current Behavior + description: Tell us what happens instead of the expected behavior. + validations: + required: true + - type: textarea + attributes: + label: Expected Behavior + description: Tell us what should happen. + validations: + required: false + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. In this environment... + 2. With this config... + 3. Run '...' + 4. See error... + validations: + required: true + - type: textarea + attributes: + label: Environment + description: | + examples: + - **OS**: Ubuntu 20.04 + - **How docker service was installed**: distro's packagemanager + value: | + - OS: + - How docker service was installed: + render: markdown + validations: + required: false + - type: dropdown + attributes: + label: CPU architecture + options: + - x86-64 + - arm64 + - armhf + validations: + required: true + - type: textarea + attributes: + label: Docker creation + description: | + Command used to create docker container + Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container + render: bash + validations: + required: true + - type: textarea + attributes: + description: | + Provide a full docker log, output of "docker logs linuxserver.io" + label: Container logs + placeholder: | + Output of `docker logs linuxserver.io` + render: bash + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml new file mode 100755 index 0000000..099dcdb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.yml @@ -0,0 +1,31 @@ +# Based on the issue template +name: Feature request +description: Suggest an idea for this project +title: "[FEAT] <title>" +labels: [enhancement] +body: + - type: checkboxes + attributes: + label: Is this a new feature request? + description: Please search to see if a feature request already exists. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Wanted change + description: Tell us what you want to happen. + validations: + required: true + - type: textarea + attributes: + label: Reason for change + description: Justify your request, why do you want it, what is the benefit. + validations: + required: true + - type: textarea + attributes: + label: Proposed code change + description: Do you have a potential code change in mind? + validations: + required: false diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index bffb2a7..9330a0d 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-development: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: External Trigger if: github.ref == 'refs/heads/development' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 2d820d1..2f1117c 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 43a005a..abed828 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-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bazarr/blob/development/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 2f0261b..789a097 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-development: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: Package Trigger if: github.ref == 'refs/heads/development' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 1ae3810..55761fb 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3b3846e..73dfe45 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v6.0.1 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." From 6fc681fde589390168b4a81996a7b4104e80461c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 10 Dec 2022 22:35:27 -0600 Subject: [PATCH 281/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 135313f..35f4a6c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ py3-retrying-1.3.3-r3 py3-setuptools-59.4.0-r0 py3-six-1.16.0-r1 py3-tomli-2.0.1-r1 -python3-3.10.8-r0 +python3-3.10.9-r0 readline-8.1.2-r0 scanelf-1.3.4-r0 sdl2-2.0.22-r0 From 6668445f1aed8b2f55d5be16cf9ee644f73db57b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 15 Dec 2022 10:58:53 -0600 Subject: [PATCH 282/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 35f4a6c..ec52c32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -59,7 +59,7 @@ libsrt-1.4.4-r0 libssh-0.9.6-r1 libssl1.1-1.1.1s-r0 libstdc++-11.2.1_git20220219-r2 -libtasn1-4.18.0-r0 +libtasn1-4.18.0-r1 libtheora-1.1.1-r16 libunistring-1.0-r0 libva-2.14.0-r0 From d5dca2a832eb797b4b7096383c27c25bc4a77c71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 16 Dec 2022 03:57:58 +0100 Subject: [PATCH 283/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ec52c32..973803d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -76,7 +76,7 @@ libxfixes-6.0.0-r0 libxml2-2.9.14-r2 libxslt-1.1.35-r0 linux-pam-1.5.2-r0 -mbedtls-2.28.1-r0 +mbedtls-2.28.2-r0 mpdecimal-2.5.1-r1 musl-1.2.3-r2 musl-utils-1.2.3-r2 From 82482c6538ed9559b04144b8657c3e5b8e986438 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 31 Dec 2022 10:55:05 -0600 Subject: [PATCH 284/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 973803d..1e96a75 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 cjson-1.7.15-r3 coreutils-9.1-r0 -curl-7.83.1-r4 +curl-7.83.1-r5 dbus-libs-1.14.4-r0 expat-2.5.0-r0 ffmpeg-5.0.1-r1 @@ -36,7 +36,7 @@ libblkid-2.38-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1s-r0 -libcurl-7.83.1-r4 +libcurl-7.83.1-r5 libdav1d-1.0.0-r0 libdrm-2.4.110-r0 libffi-3.4.2-r1 From d27e5d548b508a81635921f12b34046ff339f674 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 23 Jan 2023 17:14:12 +0000 Subject: [PATCH 285/525] Rebase to 3.17 --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++ Dockerfile | 23 +++++++++---------- Dockerfile.aarch64 | 23 +++++++++---------- Dockerfile.armhf | 23 +++++++++---------- README.md | 1 + readme-vars.yml | 1 + .../s6-overlay/s6-rc.d/init-bazarr-config/run | 2 +- 7 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml 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/Dockerfile b/Dockerfile index faa87ff..65099aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 # set version label ARG UNRAR_VERSION=6.1.7 @@ -15,22 +17,16 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ ffmpeg \ libxml2 \ libxslt \ - py3-pip \ - python3 \ - unzip && \ + python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ curl -o \ @@ -58,15 +54,18 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install -U --no-cache-dir pip && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ + 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/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ - /root/.cargo \ + $HOME/.cache \ + $HOME/.cargo \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e5be544..50afed4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 # set version label ARG UNRAR_VERSION=6.1.7 @@ -15,22 +17,16 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ ffmpeg \ libxml2 \ libxslt \ - py3-pip \ - python3 \ - unzip && \ + python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ curl -o \ @@ -58,15 +54,18 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install -U --no-cache-dir pip && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ + 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/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ - /root/.cargo \ + $HOME/.cache \ + $HOME/.cargo \ /tmp/* # add local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index fbeba44..13c6466 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 # set version label ARG UNRAR_VERSION=6.1.7 @@ -15,22 +17,16 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ build-base \ cargo \ - g++ \ - gcc \ - jq \ libffi-dev \ libxml2-dev \ libxslt-dev \ - make \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ ffmpeg \ libxml2 \ libxslt \ - py3-pip \ - python3 \ - unzip && \ + python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ curl -o \ @@ -58,15 +54,18 @@ RUN \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ - pip3 install -U --no-cache-dir pip && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r \ + 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/ -r \ /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ - /root/.cache \ - /root/.cargo \ + $HOME/.cache \ + $HOME/.cargo \ /tmp/* # add local files diff --git a/README.md b/README.md index 9ff725d..d24a20b 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.10.22:** - Rebase development branch to Alpine 3.17. * **11.10.22:** - Rebase development branch to Alpine 3.16, migrate to s6v3. * **15.11.21:** - Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken. * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. diff --git a/readme-vars.yml b/readme-vars.yml index 28a400f..a2718c1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.17." } - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3." } - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." } - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run index aa3208d..3a13f42 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run @@ -1,5 +1,5 @@ #!/usr/bin/with-contenv bash # permissions -chown -R abc:abc \ +lsiown -R abc:abc \ /config From caf563cb8125a2dae8fc130e573fcd9cb2541393 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 23 Jan 2023 17:18:24 +0000 Subject: [PATCH 286/525] Fix changelog date --- README.md | 2 +- readme-vars.yml | 2 +- root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type | 2 +- root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up | 2 +- root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd | 2 +- root/etc/s6-overlay/s6-rc.d/svc-bazarr/type | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d24a20b..ed81509 100644 --- a/README.md +++ b/README.md @@ -232,7 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **11.10.22:** - Rebase development branch to Alpine 3.17. +* **23.01.23:** - Rebase development branch to Alpine 3.17. * **11.10.22:** - Rebase development branch to Alpine 3.16, migrate to s6v3. * **15.11.21:** - Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken. * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. diff --git a/readme-vars.yml b/readme-vars.yml index a2718c1..2e5ed30 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,7 +45,7 @@ app_setup_block: | # changelog changelogs: - - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.17." } + - { date: "23.01.23:", desc: "Rebase development branch to Alpine 3.17." } - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3." } - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." } - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type index 3d92b15..bdd22a1 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up index 2d0b6ae..0fb4d49 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-bazarr-config/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-bazarr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd index e440e5c..00750ed 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd @@ -1 +1 @@ -3 \ No newline at end of file +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type index 1780f9f..5883cff 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun From 82f30cc3e6eafc2066ec252d739880cebfbdc740 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Jan 2023 18:50:39 +0100 Subject: [PATCH 287/525] Bot Updating Package Versions --- package_versions.txt | 201 +++++++++++++++++++++---------------------- 1 file changed, 98 insertions(+), 103 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1e96a75..6396082 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,128 +1,123 @@ -alpine-baselayout-3.2.0-r23 -alpine-baselayout-data-3.2.0-r23 +alpine-baselayout-3.4.0-r0 +alpine-baselayout-data-3.4.0-r0 alpine-keys-2.4-r1 -alsa-lib-1.2.7.2-r0 -aom-libs-3.3.0-r0 -apk-tools-2.12.9-r3 -bash-5.1.16-r2 -brotli-libs-1.0.9-r6 -busybox-1.35.0-r17 -ca-certificates-20220614-r0 -ca-certificates-bundle-20220614-r0 +alpine-release-3.17.1-r0 +alsa-lib-1.2.8-r0 +aom-libs-3.5.0-r0 +apk-tools-2.12.10-r1 +bash-5.2.15-r0 +brotli-libs-1.0.9-r9 +busybox-1.35.0-r29 +busybox-binsh-1.35.0-r29 +ca-certificates-20220614-r4 +ca-certificates-bundle-20220614-r4 cjson-1.7.15-r3 coreutils-9.1-r0 -curl-7.83.1-r5 +curl-7.87.0-r1 dbus-libs-1.14.4-r0 -expat-2.5.0-r0 -ffmpeg-5.0.1-r1 -ffmpeg-libs-5.0.1-r1 -flac-1.3.4-r0 -fontconfig-2.14.0-r0 +ffmpeg-5.1.2-r1 +ffmpeg-libs-5.1.2-r1 +flac-libs-1.4.2-r0 +fontconfig-2.14.1-r0 freetype-2.12.1-r0 fribidi-1.0.12-r0 gdbm-1.23-r0 -glib-2.72.1-r0 +glib-2.74.5-r0 gmp-6.2.1-r2 -gnutls-3.7.7-r0 -graphite2-1.3.14-r1 -harfbuzz-4.3.0-r0 -jq-1.6-r1 -lame-3.100-r0 -libacl-2.3.1-r0 +gnutls-3.7.8-r2 +graphite2-1.3.14-r2 +harfbuzz-5.3.1-r1 +hwdata-pci-0.364-r0 +jq-1.6-r2 +lame-3.100-r2 +libacl-2.3.1-r1 libass-0.16.0-r0 libasyncns-0.8-r1 -libattr-2.5.1-r1 -libblkid-2.38-r1 -libbz2-1.0.8-r1 +libattr-2.5.1-r2 +libblkid-2.38.1-r1 +libbsd-0.11.7-r0 +libbz2-1.0.8-r4 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1s-r0 -libcurl-7.83.1-r5 -libdav1d-1.0.0-r0 -libdrm-2.4.110-r0 -libffi-3.4.2-r1 -libgcc-11.2.1_git20220219-r2 +libcrypto3-3.0.7-r2 +libcurl-7.87.0-r1 +libdav1d-1.0.0-r2 +libdrm-2.4.114-r0 +libexpat-2.5.0-r0 +libffi-3.4.4-r0 +libgcc-12.2.1_git20220924-r4 libgcrypt-1.10.1-r0 -libgomp-11.2.1_git20220219-r2 -libgpg-error-1.45-r0 -libintl-0.21-r2 -libjpeg-turbo-2.1.3-r1 +libgomp-12.2.1_git20220924-r4 +libgpg-error-1.46-r1 +libintl-0.21.1-r1 +libjpeg-turbo-2.1.4-r0 libltdl-2.4.7-r0 -libmount-2.38-r1 -libogg-1.3.5-r1 -libpciaccess-0.16-r0 -libpng-1.6.37-r1 -libproc-3.3.17-r1 -libpulse-15.0-r2 -librist-0.2.6-r1 -libsndfile-1.1.0-r0 -libsrt-1.4.4-r0 -libssh-0.9.6-r1 -libssl1.1-1.1.1s-r0 -libstdc++-11.2.1_git20220219-r2 -libtasn1-4.18.0-r1 +libmd-1.0.4-r0 +libmount-2.38.1-r1 +libogg-1.3.5-r2 +libpciaccess-0.17-r0 +libpng-1.6.38-r0 +libproc-3.3.17-r2 +libpulse-16.1-r6 +librist-0.2.7-r0 +libsndfile-1.1.0-r2 +libsodium-1.0.18-r2 +libsrt-1.5.1-r0 +libssh-0.10.4-r0 +libssl3-3.0.7-r2 +libstdc++-12.2.1_git20220924-r4 +libtasn1-4.19.0-r0 libtheora-1.1.1-r16 -libunistring-1.0-r0 -libva-2.14.0-r0 +libunistring-1.1-r0 +libva-2.16.0-r0 libvdpau-1.5-r0 libvorbis-1.3.7-r0 -libvpx-1.11.0-r1 -libwebp-1.2.3-r0 -libx11-1.8-r0 -libxau-1.0.9-r0 +libvpx-1.12.0-r1 +libwebp-1.2.4-r1 +libx11-1.8.3-r1 +libxau-1.0.10-r0 libxcb-1.15-r0 -libxdmcp-1.1.3-r0 -libxext-1.3.4-r0 +libxdmcp-1.1.4-r0 +libxext-1.3.5-r0 libxfixes-6.0.0-r0 -libxml2-2.9.14-r2 -libxslt-1.1.35-r0 -linux-pam-1.5.2-r0 +libxml2-2.10.3-r1 +libxslt-1.1.37-r0 +libzmq-4.3.4-r1 +linux-pam-1.5.2-r1 mbedtls-2.28.2-r0 mpdecimal-2.5.1-r1 -musl-1.2.3-r2 -musl-utils-1.2.3-r2 -ncurses-libs-6.3_p20220521-r0 -ncurses-terminfo-base-6.3_p20220521-r0 -nettle-3.7.3-r0 -nghttp2-libs-1.47.0-r0 -numactl-2.0.14-r0 +musl-1.2.3-r4 +musl-utils-1.2.3-r4 +ncurses-libs-6.3_p20221119-r0 +ncurses-terminfo-base-6.3_p20221119-r0 +nettle-3.8.1-r0 +nghttp2-libs-1.51.0-r0 +numactl-2.0.16-r0 oniguruma-6.9.8-r0 opus-1.3.1-r1 -orc-0.4.32-r0 -p11-kit-0.24.1-r0 -pcre-8.45-r2 -procps-3.3.17-r1 -py3-appdirs-1.4.4-r3 -py3-contextlib2-21.6.0-r2 -py3-more-itertools-8.13.0-r0 -py3-ordered-set-4.0.2-r3 -py3-packaging-21.3-r0 -py3-parsing-2.4.7-r3 -py3-pep517-0.12.0-r2 -py3-pip-22.1.1-r0 -py3-retrying-1.3.3-r3 -py3-setuptools-59.4.0-r0 -py3-six-1.16.0-r1 -py3-tomli-2.0.1-r1 -python3-3.10.9-r0 -readline-8.1.2-r0 -scanelf-1.3.4-r0 -sdl2-2.0.22-r0 -shadow-4.10-r3 -skalibs-2.11.2.0-r0 -soxr-0.1.3-r2 -speexdsp-1.2.0-r0 -sqlite-libs-3.38.5-r0 -ssl_client-1.35.0-r17 -tdb-libs-1.4.6-r0 +orc-0.4.33-r0 +p11-kit-0.24.1-r1 +pcre2-10.42-r0 +procps-3.3.17-r2 +python3-3.10.9-r1 +readline-8.2.0-r0 +scanelf-1.3.5-r1 +sdl2-2.26.2-r0 +shadow-4.13-r0 +skalibs-2.12.0.1-r0 +soxr-0.1.3-r3 +speexdsp-1.2.1-r0 +sqlite-libs-3.40.1-r0 +ssl_client-1.35.0-r29 +svt-av1-libs-1.3.0-r0 +tdb-libs-1.4.7-r0 tzdata-2022f-r1 -unzip-6.0-r9 -utmps-libs-0.1.2.0-r0 -v4l-utils-libs-1.22.1-r1 -vidstab-1.1.0-r1 -wayland-libs-client-1.20.0-r0 -x264-libs-0.163_git20210613-r0 +utmps-libs-0.1.2.0-r1 +v4l-utils-libs-1.22.1-r2 +vidstab-1.1.0-r2 +wayland-libs-client-1.21.0-r1 +x264-libs-0.164_git20220602-r0 x265-libs-3.5-r3 xvidcore-1.3.7-r1 -xz-5.2.5-r1 -xz-libs-5.2.5-r1 -zlib-1.2.12-r3 +xz-5.2.9-r0 +xz-libs-5.2.9-r0 +zlib-1.2.13-r0 From e1b3b68349be80efb092c576d1672815bcda5d01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 29 Jan 2023 05:33:23 +0100 Subject: [PATCH 288/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6396082..de3df62 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -91,7 +91,7 @@ ncurses-libs-6.3_p20221119-r0 ncurses-terminfo-base-6.3_p20221119-r0 nettle-3.8.1-r0 nghttp2-libs-1.51.0-r0 -numactl-2.0.16-r0 +numactl-2.0.16-r1 oniguruma-6.9.8-r0 opus-1.3.1-r1 orc-0.4.33-r0 From f5e368c1540e8e8a0655cdc7ead14a4192b2498f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 4 Feb 2023 22:33:08 -0600 Subject: [PATCH 289/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index de3df62..75a5744 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -73,7 +73,7 @@ libvdpau-1.5-r0 libvorbis-1.3.7-r0 libvpx-1.12.0-r1 libwebp-1.2.4-r1 -libx11-1.8.3-r1 +libx11-1.8.4-r0 libxau-1.0.10-r0 libxcb-1.15-r0 libxdmcp-1.1.4-r0 From 242d5aeb16b7c1b8a570c9e0bd3aac533206cdfe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 8 Feb 2023 07:55:06 +0100 Subject: [PATCH 290/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 75a5744..6bee923 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ libgomp-12.2.1_git20220924-r4 libgpg-error-1.46-r1 libintl-0.21.1-r1 libjpeg-turbo-2.1.4-r0 -libltdl-2.4.7-r0 +libltdl-2.4.7-r1 libmd-1.0.4-r0 libmount-2.38.1-r1 libogg-1.3.5-r2 @@ -101,7 +101,7 @@ procps-3.3.17-r2 python3-3.10.9-r1 readline-8.2.0-r0 scanelf-1.3.5-r1 -sdl2-2.26.2-r0 +sdl2-2.26.3-r0 shadow-4.13-r0 skalibs-2.12.0.1-r0 soxr-0.1.3-r3 From e07ab43ed6454ddad734c0a81f6fd45d1cd98710 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 9 Feb 2023 06:54:55 +0000 Subject: [PATCH 291/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6bee923..130eac6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -98,7 +98,7 @@ orc-0.4.33-r0 p11-kit-0.24.1-r1 pcre2-10.42-r0 procps-3.3.17-r2 -python3-3.10.9-r1 +python3-3.10.10-r0 readline-8.2.0-r0 scanelf-1.3.5-r1 sdl2-2.26.3-r0 From cc7896b5af4d1dd38f746975aa8a992e2c0a1eff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Feb 2023 00:53:08 -0600 Subject: [PATCH 292/525] Bot Updating Templated Files --- Jenkinsfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d00c36b..a75aaab 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 ./root/donate.txt' + 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 ./root/donate.txt' } 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 development-${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-development - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development 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-development 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-development 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-development - docker push ${MANIFESTIMAGE}:arm32v7-development - docker push ${MANIFESTIMAGE}:arm64v8-development docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-development + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-development docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-development 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} ''' } From 8dcba880dbd4185895f7769c05adc1aa99a9507d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Feb 2023 00:54:35 -0600 Subject: [PATCH 293/525] Bot Updating Templated Files --- .editorconfig | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/permissions.yml | 9 +++++++++ README.md | 9 +++++---- 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100755 .github/workflows/permissions.yml 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/greetings.yml b/.github/workflows/greetings.yml index abed828..d3866d2 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-bazarr/blob/development/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bazarr/blob/development/.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-bazarr/blob/development/.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 100755 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/README.md b/README.md index ed81509..10cec44 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf| ✅ | arm32v7-\<version tag\> | +| armhf | ✅ | arm32v7-\<version tag\> | ## Application Setup @@ -79,7 +79,7 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Etc/UTC volumes: - /path/to/bazarr/config:/config - /path/to/movies:/movies @@ -96,13 +96,14 @@ docker run -d \ --name=bazarr \ -e PUID=1000 \ -e PGID=1000 \ - -e TZ=Europe/London \ + -e TZ=Etc/UTC \ -p 6767:6767 \ -v /path/to/bazarr/config:/config \ -v /path/to/movies:/movies \ -v /path/to/tv:/tv \ --restart unless-stopped \ lscr.io/linuxserver/bazarr:development + ``` You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. @@ -118,7 +119,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 6767` | Allows HTTP access to the internal webserver. | | `-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` | Bazarr data | | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | From 21c9abf752e372b52beab2f972284e54a5b6c4a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Feb 2023 01:00:11 -0600 Subject: [PATCH 294/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 130eac6..0bea370 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ fribidi-1.0.12-r0 gdbm-1.23-r0 glib-2.74.5-r0 gmp-6.2.1-r2 -gnutls-3.7.8-r2 +gnutls-3.7.8-r3 graphite2-1.3.14-r2 harfbuzz-5.3.1-r1 hwdata-pci-0.364-r0 From 9b347628eff4ea1638e72b7636dc630a6890f84d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 15 Feb 2023 07:55:11 +0100 Subject: [PATCH 295/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0bea370..968df34 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.4.0-r0 alpine-baselayout-data-3.4.0-r0 alpine-keys-2.4-r1 -alpine-release-3.17.1-r0 +alpine-release-3.17.2-r0 alsa-lib-1.2.8-r0 aom-libs-3.5.0-r0 apk-tools-2.12.10-r1 @@ -38,7 +38,7 @@ libblkid-2.38.1-r1 libbsd-0.11.7-r0 libbz2-1.0.8-r4 libc-utils-0.7.2-r3 -libcrypto3-3.0.7-r2 +libcrypto3-3.0.8-r0 libcurl-7.87.0-r1 libdav1d-1.0.0-r2 libdrm-2.4.114-r0 @@ -63,7 +63,7 @@ libsndfile-1.1.0-r2 libsodium-1.0.18-r2 libsrt-1.5.1-r0 libssh-0.10.4-r0 -libssl3-3.0.7-r2 +libssl3-3.0.8-r0 libstdc++-12.2.1_git20220924-r4 libtasn1-4.19.0-r0 libtheora-1.1.1-r16 From 50e6c180b1e58bc0357a9c830b94690f1e066602 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 17 Feb 2023 09:04:54 +0000 Subject: [PATCH 296/525] Add deps for postgres, add mediainfo --- Dockerfile | 22 ++++++++++++++-------- Dockerfile.aarch64 | 22 ++++++++++++++-------- Dockerfile.armhf | 22 ++++++++++++++-------- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65099aa..53783a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN \ build-base \ cargo \ libffi-dev \ + libpq-dev \ libxml2-dev \ libxslt-dev \ python3-dev && \ @@ -26,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + mediainfo \ python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ @@ -39,18 +41,18 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ + mkdir -p \ + /app/bazarr/bin && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.zip -L \ - "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ - mkdir -p \ - /app/bazarr/bin && \ - unzip \ - /tmp/bazarr.zip -d \ - /app/bazarr/bin && \ + /tmp/bazarr.tar.gz -L \ + "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ + tar xzf \ + /tmp/bazarr.tar.gz -C \ + /app/bazarr/bin --strip-components=1 && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ @@ -60,13 +62,17 @@ RUN \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ /app/bazarr/bin/requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ + /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* + /tmp/* \ + /app/bazarr/bin/screenshot \ + /app/bazarr/bin/tests # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 50afed4..667e9ff 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,6 +18,7 @@ RUN \ build-base \ cargo \ libffi-dev \ + libpq-dev \ libxml2-dev \ libxslt-dev \ python3-dev && \ @@ -26,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + mediainfo \ python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ @@ -39,18 +41,18 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ + mkdir -p \ + /app/bazarr/bin && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.zip -L \ - "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ - mkdir -p \ - /app/bazarr/bin && \ - unzip \ - /tmp/bazarr.zip -d \ - /app/bazarr/bin && \ + /tmp/bazarr.tar.gz -L \ + "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ + tar xzf \ + /tmp/bazarr.tar.gz -C \ + /app/bazarr/bin --strip-components=1 && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ @@ -60,13 +62,17 @@ RUN \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ /app/bazarr/bin/requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ + /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* + /tmp/* \ + /app/bazarr/bin/screenshot \ + /app/bazarr/bin/tests # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 13c6466..e459702 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,6 +18,7 @@ RUN \ build-base \ cargo \ libffi-dev \ + libpq-dev \ libxml2-dev \ libxslt-dev \ python3-dev && \ @@ -26,6 +27,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + mediainfo \ python3 && \ echo "**** install unrar from source ****" && \ mkdir /tmp/unrar && \ @@ -39,18 +41,18 @@ RUN \ make && \ install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ + mkdir -p \ + /app/bazarr/bin && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.zip -L \ - "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ - mkdir -p \ - /app/bazarr/bin && \ - unzip \ - /tmp/bazarr.zip -d \ - /app/bazarr/bin && \ + /tmp/bazarr.tar.gz -L \ + "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ + tar xzf \ + /tmp/bazarr.tar.gz -C \ + /app/bazarr/bin --strip-components=1 && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ echo "**** Install requirements ****" && \ @@ -60,13 +62,17 @@ RUN \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ /app/bazarr/bin/requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ + /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* + /tmp/* \ + /app/bazarr/bin/screenshot \ + /app/bazarr/bin/tests # add local files COPY root/ / diff --git a/README.md b/README.md index 10cec44..c4e5a6b 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase development branch to Alpine 3.17. * **11.10.22:** - Rebase development branch to Alpine 3.16, migrate to s6v3. * **15.11.21:** - Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken. diff --git a/readme-vars.yml b/readme-vars.yml index 2e5ed30..5f7fbe4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.02.23:", desc: "Add dependencies for postgres support. Add mediainfo." } - { date: "23.01.23:", desc: "Rebase development branch to Alpine 3.17." } - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3." } - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." } From e17df26ca74d39edc01ad1485b42b4faff8dbbee Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 17 Feb 2023 09:11:09 +0000 Subject: [PATCH 297/525] Merge the pip installs --- Dockerfile | 7 +++---- Dockerfile.aarch64 | 7 +++---- Dockerfile.armhf | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53783a9..62014a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,10 +60,9 @@ RUN \ pip3 install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/requirements.txt && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/postgres-requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + -r /app/bazarr/bin/requirements.txt \ + -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 667e9ff..6d37cbd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,10 +60,9 @@ RUN \ pip3 install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/requirements.txt && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/postgres-requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + -r /app/bazarr/bin/requirements.txt \ + -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e459702..cb84542 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -60,10 +60,9 @@ RUN \ pip3 install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/requirements.txt && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r \ - /app/bazarr/bin/postgres-requirements.txt && \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + -r /app/bazarr/bin/requirements.txt \ + -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ From 77f1de8e0603a12fbe392d7ba32cc78b45593f5b Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 17 Feb 2023 09:38:26 +0000 Subject: [PATCH 298/525] Use zip release, download postgres reqs separately --- Dockerfile | 17 +++++++++-------- Dockerfile.aarch64 | 17 +++++++++-------- Dockerfile.armhf | 17 +++++++++-------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62014a6..28b78ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,13 +48,16 @@ RUN \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ - tar xzf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ + curl -o \ + /app/bazarr/bin/postgres-requirements.txt -L \ + "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ echo "**** Install requirements ****" && \ python3 -m ensurepip && \ pip3 install -U --no-cache-dir \ @@ -69,9 +72,7 @@ RUN \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* \ - /app/bazarr/bin/screenshot \ - /app/bazarr/bin/tests + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6d37cbd..b55882c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -48,13 +48,16 @@ RUN \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ - tar xzf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ + curl -o \ + /app/bazarr/bin/postgres-requirements.txt -L \ + "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ echo "**** Install requirements ****" && \ python3 -m ensurepip && \ pip3 install -U --no-cache-dir \ @@ -69,9 +72,7 @@ RUN \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* \ - /app/bazarr/bin/screenshot \ - /app/bazarr/bin/tests + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index cb84542..2e735a4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -48,13 +48,16 @@ RUN \ | jq -r '.[0] | .tag_name'); \ fi && \ curl -o \ - /tmp/bazarr.tar.gz -L \ - "https://github.com/morpheus65535/bazarr/archive/refs/tags/${BAZARR_VERSION}.tar.gz" && \ - tar xzf \ - /tmp/bazarr.tar.gz -C \ - /app/bazarr/bin --strip-components=1 && \ + /tmp/bazarr.zip -L \ + "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ + unzip \ + /tmp/bazarr.zip -d \ + /app/bazarr/bin && \ rm -Rf /app/bazarr/bin/bin && \ echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ + curl -o \ + /app/bazarr/bin/postgres-requirements.txt -L \ + "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ echo "**** Install requirements ****" && \ python3 -m ensurepip && \ pip3 install -U --no-cache-dir \ @@ -69,9 +72,7 @@ RUN \ rm -rf \ $HOME/.cache \ $HOME/.cargo \ - /tmp/* \ - /app/bazarr/bin/screenshot \ - /app/bazarr/bin/tests + /tmp/* # add local files COPY root/ / From 2c7882860154c4916c383e069a555bc3ec6cc92b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 17 Feb 2023 07:29:34 -0600 Subject: [PATCH 299/525] Bot Updating Package Versions --- package_versions.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 968df34..1b3281c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,6 +52,7 @@ libintl-0.21.1-r1 libjpeg-turbo-2.1.4-r0 libltdl-2.4.7-r1 libmd-1.0.4-r0 +libmediainfo-22.09-r0 libmount-2.38.1-r1 libogg-1.3.5-r2 libpciaccess-0.17-r0 @@ -81,9 +82,11 @@ libxext-1.3.5-r0 libxfixes-6.0.0-r0 libxml2-2.10.3-r1 libxslt-1.1.37-r0 +libzen-0.4.39-r0 libzmq-4.3.4-r1 linux-pam-1.5.2-r1 mbedtls-2.28.2-r0 +mediainfo-22.09-r0 mpdecimal-2.5.1-r1 musl-1.2.3-r4 musl-utils-1.2.3-r4 @@ -110,6 +113,7 @@ sqlite-libs-3.40.1-r0 ssl_client-1.35.0-r29 svt-av1-libs-1.3.0-r0 tdb-libs-1.4.7-r0 +tinyxml2-9.0.0-r0 tzdata-2022f-r1 utmps-libs-0.1.2.0-r1 v4l-utils-libs-1.22.1-r2 From 86673cec78596328d99e97c3fe1ec49e9c05477b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Feb 2023 00:58:09 -0600 Subject: [PATCH 300/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1b3281c..e7e7f58 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ ca-certificates-20220614-r4 ca-certificates-bundle-20220614-r4 cjson-1.7.15-r3 coreutils-9.1-r0 -curl-7.87.0-r1 +curl-7.87.0-r2 dbus-libs-1.14.4-r0 ffmpeg-5.1.2-r1 ffmpeg-libs-5.1.2-r1 @@ -39,7 +39,7 @@ libbsd-0.11.7-r0 libbz2-1.0.8-r4 libc-utils-0.7.2-r3 libcrypto3-3.0.8-r0 -libcurl-7.87.0-r1 +libcurl-7.87.0-r2 libdav1d-1.0.0-r2 libdrm-2.4.114-r0 libexpat-2.5.0-r0 From 21adc1af6fd64c000664462fe952a6ff0eeb7d6e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 24 Feb 2023 05:55:38 -0600 Subject: [PATCH 301/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e7e7f58..26b64e5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ fontconfig-2.14.1-r0 freetype-2.12.1-r0 fribidi-1.0.12-r0 gdbm-1.23-r0 -glib-2.74.5-r0 +glib-2.74.6-r0 gmp-6.2.1-r2 gnutls-3.7.8-r3 graphite2-1.3.14-r2 From 3d15253e66799e2e2f863a68d97ca54de94c0d8a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Feb 2023 07:58:00 +0100 Subject: [PATCH 302/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 26b64e5..613f4dc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ hwdata-pci-0.364-r0 jq-1.6-r2 lame-3.100-r2 libacl-2.3.1-r1 -libass-0.16.0-r0 +libass-0.16.0-r1 libasyncns-0.8-r1 libattr-2.5.1-r2 libblkid-2.38.1-r1 From 3d42d670006a140dd2adfd2744c62c8e8aef8407 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Mar 2023 06:52:54 +0000 Subject: [PATCH 303/525] Bot Updating Templated Files --- Jenkinsfile | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a75aaab..2291aaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -452,7 +452,8 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ @@ -465,7 +466,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ - --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -482,7 +483,8 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ @@ -495,7 +497,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ - --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -509,7 +511,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ @@ -522,7 +525,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -543,7 +546,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ @@ -556,7 +560,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ - --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -585,26 +589,12 @@ pipeline { else LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info -v > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "fedora" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - rpm -qa > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "arch" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - pacman -Q > /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - fi + touch ${TEMPDIR}/package_versions.txt + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v ${TEMPDIR}:/tmp \ + ghcr.io/anchore/syft:latest \ + ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then From 6783ed3f614b07c50bb4130fc3902e2c146776b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Mar 2023 06:56:36 +0000 Subject: [PATCH 304/525] Bot Updating Package Versions --- package_versions.txt | 265 ++++++++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 127 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 613f4dc..6a28f9d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,127 +1,138 @@ -alpine-baselayout-3.4.0-r0 -alpine-baselayout-data-3.4.0-r0 -alpine-keys-2.4-r1 -alpine-release-3.17.2-r0 -alsa-lib-1.2.8-r0 -aom-libs-3.5.0-r0 -apk-tools-2.12.10-r1 -bash-5.2.15-r0 -brotli-libs-1.0.9-r9 -busybox-1.35.0-r29 -busybox-binsh-1.35.0-r29 -ca-certificates-20220614-r4 -ca-certificates-bundle-20220614-r4 -cjson-1.7.15-r3 -coreutils-9.1-r0 -curl-7.87.0-r2 -dbus-libs-1.14.4-r0 -ffmpeg-5.1.2-r1 -ffmpeg-libs-5.1.2-r1 -flac-libs-1.4.2-r0 -fontconfig-2.14.1-r0 -freetype-2.12.1-r0 -fribidi-1.0.12-r0 -gdbm-1.23-r0 -glib-2.74.6-r0 -gmp-6.2.1-r2 -gnutls-3.7.8-r3 -graphite2-1.3.14-r2 -harfbuzz-5.3.1-r1 -hwdata-pci-0.364-r0 -jq-1.6-r2 -lame-3.100-r2 -libacl-2.3.1-r1 -libass-0.16.0-r1 -libasyncns-0.8-r1 -libattr-2.5.1-r2 -libblkid-2.38.1-r1 -libbsd-0.11.7-r0 -libbz2-1.0.8-r4 -libc-utils-0.7.2-r3 -libcrypto3-3.0.8-r0 -libcurl-7.87.0-r2 -libdav1d-1.0.0-r2 -libdrm-2.4.114-r0 -libexpat-2.5.0-r0 -libffi-3.4.4-r0 -libgcc-12.2.1_git20220924-r4 -libgcrypt-1.10.1-r0 -libgomp-12.2.1_git20220924-r4 -libgpg-error-1.46-r1 -libintl-0.21.1-r1 -libjpeg-turbo-2.1.4-r0 -libltdl-2.4.7-r1 -libmd-1.0.4-r0 -libmediainfo-22.09-r0 -libmount-2.38.1-r1 -libogg-1.3.5-r2 -libpciaccess-0.17-r0 -libpng-1.6.38-r0 -libproc-3.3.17-r2 -libpulse-16.1-r6 -librist-0.2.7-r0 -libsndfile-1.1.0-r2 -libsodium-1.0.18-r2 -libsrt-1.5.1-r0 -libssh-0.10.4-r0 -libssl3-3.0.8-r0 -libstdc++-12.2.1_git20220924-r4 -libtasn1-4.19.0-r0 -libtheora-1.1.1-r16 -libunistring-1.1-r0 -libva-2.16.0-r0 -libvdpau-1.5-r0 -libvorbis-1.3.7-r0 -libvpx-1.12.0-r1 -libwebp-1.2.4-r1 -libx11-1.8.4-r0 -libxau-1.0.10-r0 -libxcb-1.15-r0 -libxdmcp-1.1.4-r0 -libxext-1.3.5-r0 -libxfixes-6.0.0-r0 -libxml2-2.10.3-r1 -libxslt-1.1.37-r0 -libzen-0.4.39-r0 -libzmq-4.3.4-r1 -linux-pam-1.5.2-r1 -mbedtls-2.28.2-r0 -mediainfo-22.09-r0 -mpdecimal-2.5.1-r1 -musl-1.2.3-r4 -musl-utils-1.2.3-r4 -ncurses-libs-6.3_p20221119-r0 -ncurses-terminfo-base-6.3_p20221119-r0 -nettle-3.8.1-r0 -nghttp2-libs-1.51.0-r0 -numactl-2.0.16-r1 -oniguruma-6.9.8-r0 -opus-1.3.1-r1 -orc-0.4.33-r0 -p11-kit-0.24.1-r1 -pcre2-10.42-r0 -procps-3.3.17-r2 -python3-3.10.10-r0 -readline-8.2.0-r0 -scanelf-1.3.5-r1 -sdl2-2.26.3-r0 -shadow-4.13-r0 -skalibs-2.12.0.1-r0 -soxr-0.1.3-r3 -speexdsp-1.2.1-r0 -sqlite-libs-3.40.1-r0 -ssl_client-1.35.0-r29 -svt-av1-libs-1.3.0-r0 -tdb-libs-1.4.7-r0 -tinyxml2-9.0.0-r0 -tzdata-2022f-r1 -utmps-libs-0.1.2.0-r1 -v4l-utils-libs-1.22.1-r2 -vidstab-1.1.0-r2 -wayland-libs-client-1.21.0-r1 -x264-libs-0.164_git20220602-r0 -x265-libs-3.5-r3 -xvidcore-1.3.7-r1 -xz-5.2.9-r0 -xz-libs-5.2.9-r0 -zlib-1.2.13-r0 +NAME VERSION TYPE +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.2-r0 apk +alsa-lib 1.2.8-r0 apk +aom-libs 3.5.0-r0 apk +apk-tools 2.12.10-r1 apk +bash 5.2.15-r0 apk +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 20220614-r4 apk +ca-certificates-bundle 20220614-r4 apk +cjson 1.7.15-r3 apk +coreutils 9.1-r0 apk +curl 7.88.1-r0 apk +dbus-libs 1.14.4-r0 apk +ffmpeg 5.1.2-r1 apk +ffmpeg-libs 5.1.2-r1 apk +flac-libs 1.4.2-r0 apk +fontconfig 2.14.1-r0 apk +freetype 2.12.1-r0 apk +fribidi 1.0.12-r0 apk +gdbm 1.23-r0 apk +glib 2.74.6-r0 apk +gmp 6.2.1-r2 apk +gnutls 3.7.8-r3 apk +graphite2 1.3.14-r2 apk +harfbuzz 5.3.1-r1 apk +hwdata-pci 0.364-r0 apk +jq 1.6-r2 apk +lame 3.100-r2 apk +libacl 2.3.1-r1 apk +libass 0.16.0-r1 apk +libasyncns 0.8-r1 apk +libattr 2.5.1-r2 apk +libblkid 2.38.1-r1 apk +libbsd 0.11.7-r0 apk +libbz2 1.0.8-r4 apk +libc-utils 0.7.2-r3 apk +libcrypto3 3.0.8-r0 apk +libcurl 7.88.1-r0 apk +libdav1d 1.0.0-r2 apk +libdrm 2.4.114-r0 apk +libexpat 2.5.0-r0 apk +libffi 3.4.4-r0 apk +libgcc 12.2.1_git20220924-r4 apk +libgcrypt 1.10.1-r0 apk +libgomp 12.2.1_git20220924-r4 apk +libgpg-error 1.46-r1 apk +libintl 0.21.1-r1 apk +libjpeg-turbo 2.1.4-r0 apk +libltdl 2.4.7-r1 apk +libmd 1.0.4-r0 apk +libmediainfo 22.09-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 +libproc 3.3.17-r2 apk +libpulse 16.1-r6 apk +librist 0.2.7-r0 apk +libsndfile 1.1.0-r2 apk +libsodium 1.0.18-r2 apk +libsrt 1.5.1-r0 apk +libssh 0.10.4-r0 apk +libssl3 3.0.8-r0 apk +libstdc++ 12.2.1_git20220924-r4 apk +libtasn1 4.19.0-r0 apk +libtheora 1.1.1-r16 apk +libunistring 1.1-r0 apk +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 +libxau 1.0.10-r0 apk +libxcb 1.15-r0 apk +libxdmcp 1.1.4-r0 apk +libxext 1.3.5-r0 apk +libxfixes 6.0.0-r0 apk +libxml2 2.10.3-r1 apk +libxslt 1.1.37-r0 apk +libzen 0.4.39-r0 apk +libzmq 4.3.4-r1 apk +linux-pam 1.5.2-r1 apk +lxml 4.9.2 python +mbedtls 2.28.2-r0 apk +mediainfo 22.09-r0 apk +mpdecimal 2.5.1-r1 apk +musl 1.2.3-r4 apk +musl-utils 1.2.3-r4 apk +ncurses-libs 6.3_p20221119-r0 apk +ncurses-terminfo-base 6.3_p20221119-r0 apk +netcat-openbsd 1.130-r4 apk +nettle 3.8.1-r0 apk +nghttp2-libs 1.51.0-r0 apk +numactl 2.0.16-r1 apk +numpy 1.24.2 python +oniguruma 6.9.8-r0 apk +opus 1.3.1-r1 apk +orc 0.4.33-r0 apk +p11-kit 0.24.1-r1 apk +pcre2 10.42-r0 apk +pip 23.0.1 python +procps 3.3.17-r2 apk +psycopg2-binary 2.9.5 python +python 3.10.10 binary +python3 3.10.10-r0 apk +readline 8.2.0-r0 apk +scanelf 1.3.5-r1 apk +sdl2 2.26.3-r0 apk +setuptools 67.4.0 python +shadow 4.13-r0 apk +skalibs 2.12.0.1-r0 apk +soxr 0.1.3-r3 apk +speexdsp 1.2.1-r0 apk +sqlite-libs 3.40.1-r0 apk +ssl_client 1.35.0-r29 apk +svt-av1-libs 1.3.0-r0 apk +tdb-libs 1.4.7-r0 apk +tinyxml2 9.0.0-r0 apk +tzdata 2022f-r1 apk +utmps-libs 0.1.2.0-r1 apk +v4l-utils-libs 1.22.1-r2 apk +vidstab 1.1.0-r2 apk +wayland-libs-client 1.21.0-r1 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.38.4 python +x264-libs 0.164_git20220602-r0 apk +x265-libs 3.5-r3 apk +xvidcore 1.3.7-r1 apk +xz 5.2.9-r0 apk +xz-libs 5.2.9-r0 apk +zlib 1.2.13-r0 apk From 4b29a3bf1e385804f2a0a2f6254cb1f89a79006f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Mar 2023 00:55:35 -0600 Subject: [PATCH 305/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6a28f9d..4718581 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -113,7 +113,7 @@ python3 3.10.10-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.3-r0 apk -setuptools 67.4.0 python +setuptools 67.6.0 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From de1037f942cd9cac246433412b9dc826e1046594 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Mar 2023 07:55:38 +0100 Subject: [PATCH 306/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4718581..54e958a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -83,7 +83,7 @@ libxdmcp 1.1.4-r0 apk libxext 1.3.5-r0 apk libxfixes 6.0.0-r0 apk libxml2 2.10.3-r1 apk -libxslt 1.1.37-r0 apk +libxslt 1.1.37-r1 apk libzen 0.4.39-r0 apk libzmq 4.3.4-r1 apk linux-pam 1.5.2-r1 apk From c636aaad796bd142f58a5ed7174ee3079a68841c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 16 Mar 2023 01:55:46 -0500 Subject: [PATCH 307/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 54e958a..546af7b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,7 +129,7 @@ v4l-utils-libs 1.22.1-r2 apk vidstab 1.1.0-r2 apk wayland-libs-client 1.21.0-r1 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.38.4 python +wheel 0.40.0 python x264-libs 0.164_git20220602-r0 apk x265-libs 3.5-r3 apk xvidcore 1.3.7-r1 apk From 66c5b9ccce5417409450e78527e74e1aa7aa7044 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Mar 2023 01:56:27 -0500 Subject: [PATCH 308/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 546af7b..34c6612 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,7 +15,7 @@ ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk -curl 7.88.1-r0 apk +curl 7.88.1-r1 apk dbus-libs 1.14.4-r0 apk ffmpeg 5.1.2-r1 apk ffmpeg-libs 5.1.2-r1 apk @@ -41,7 +41,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r0 apk -libcurl 7.88.1-r0 apk +libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-r0 apk From de29cfa53b00ccdaa3d99df476c9d341201fe86a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 23 Mar 2023 06:55:35 +0000 Subject: [PATCH 309/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 34c6612..ce9f142 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,8 +17,8 @@ cjson 1.7.15-r3 apk coreutils 9.1-r0 apk curl 7.88.1-r1 apk dbus-libs 1.14.4-r0 apk -ffmpeg 5.1.2-r1 apk -ffmpeg-libs 5.1.2-r1 apk +ffmpeg 5.1.2-r2 apk +ffmpeg-libs 5.1.2-r2 apk flac-libs 1.4.2-r0 apk fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk @@ -40,7 +40,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r0 apk +libcrypto3 3.0.8-r1 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -66,7 +66,7 @@ libsndfile 1.1.0-r2 apk libsodium 1.0.18-r2 apk libsrt 1.5.1-r0 apk libssh 0.10.4-r0 apk -libssl3 3.0.8-r0 apk +libssl3 3.0.8-r1 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk From 0a05eb5f1f1f5e4803d3126d4779f67cf77c2750 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Mar 2023 08:55:45 +0200 Subject: [PATCH 310/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ce9f142..bf3565c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,8 +17,8 @@ cjson 1.7.15-r3 apk coreutils 9.1-r0 apk curl 7.88.1-r1 apk dbus-libs 1.14.4-r0 apk -ffmpeg 5.1.2-r2 apk -ffmpeg-libs 5.1.2-r2 apk +ffmpeg 5.1.3-r0 apk +ffmpeg-libs 5.1.3-r0 apk flac-libs 1.4.2-r0 apk fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk @@ -123,7 +123,7 @@ ssl_client 1.35.0-r29 apk svt-av1-libs 1.3.0-r0 apk tdb-libs 1.4.7-r0 apk tinyxml2 9.0.0-r0 apk -tzdata 2022f-r1 apk +tzdata 2023b-r1 apk utmps-libs 0.1.2.0-r1 apk v4l-utils-libs 1.22.1-r2 apk vidstab 1.1.0-r2 apk From 7fa8c247c7ec0898418fbe4f26b5e63c7fd698b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 31 Mar 2023 01:59:01 -0500 Subject: [PATCH 311/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bf3565c..d7e4bd4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r1 apk +libcrypto3 3.0.8-r3 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -66,7 +66,7 @@ libsndfile 1.1.0-r2 apk libsodium 1.0.18-r2 apk libsrt 1.5.1-r0 apk libssh 0.10.4-r0 apk -libssl3 3.0.8-r1 apk +libssl3 3.0.8-r3 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -88,7 +88,7 @@ libzen 0.4.39-r0 apk libzmq 4.3.4-r1 apk linux-pam 1.5.2-r1 apk lxml 4.9.2 python -mbedtls 2.28.2-r0 apk +mbedtls 2.28.3-r0 apk mediainfo 22.09-r0 apk mpdecimal 2.5.1-r1 apk musl 1.2.3-r4 apk @@ -113,7 +113,7 @@ python3 3.10.10-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.3-r0 apk -setuptools 67.6.0 python +setuptools 67.6.1 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk @@ -121,7 +121,7 @@ speexdsp 1.2.1-r0 apk sqlite-libs 3.40.1-r0 apk ssl_client 1.35.0-r29 apk svt-av1-libs 1.3.0-r0 apk -tdb-libs 1.4.7-r0 apk +tdb-libs 1.4.6-r0 apk tinyxml2 9.0.0-r0 apk tzdata 2023b-r1 apk utmps-libs 0.1.2.0-r1 apk From 88a7af92cd34b60bb2e64661e15f4241f1e82b27 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 23:29:17 -0500 Subject: [PATCH 312/525] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2291aaa..7bb62fc 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/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' + 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' } script{ env.LS_RELEASE_NUMBER = sh( @@ -240,17 +240,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -287,7 +284,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + 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" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -304,7 +301,7 @@ pipeline { 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} - echo "Deleting old templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From 22e6fe74dabc7a2f28fca73cda6e6305eda349c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 23:30:53 -0500 Subject: [PATCH 313/525] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c..0000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -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/stale.yml b/.github/workflows/stale.yml deleted file mode 100755 index 73dfe45..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v6.0.1 - with: - stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From c39e0109a18736be51a19e86dcb3f313ee5acc46 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Apr 2023 23:32:26 -0500 Subject: [PATCH 314/525] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 0000000..efabe73 --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '31 15 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 55761fb..c9a4317 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '13 4 * * 0' + - cron: '9 21 * * 2' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61..1447bc5 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From 9f4b5621f87c8147795911690d615e8930ebe34f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Apr 2023 23:21:09 +0200 Subject: [PATCH 315/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d7e4bd4..c0d415c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE 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.2-r0 apk +alpine-release 3.17.3-r0 apk alsa-lib 1.2.8-r0 apk aom-libs 3.5.0-r0 apk apk-tools 2.12.10-r1 apk @@ -107,7 +107,7 @@ p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk pip 23.0.1 python procps 3.3.17-r2 apk -psycopg2-binary 2.9.5 python +psycopg2-binary 2.9.6 python python 3.10.10 binary python3 3.10.10-r0 apk readline 8.2.0-r0 apk @@ -123,7 +123,7 @@ ssl_client 1.35.0-r29 apk svt-av1-libs 1.3.0-r0 apk tdb-libs 1.4.6-r0 apk tinyxml2 9.0.0-r0 apk -tzdata 2023b-r1 apk +tzdata 2023c-r0 apk utmps-libs 0.1.2.0-r1 apk v4l-utils-libs 1.22.1-r2 apk vidstab 1.1.0-r2 apk From 82312b48fe96976be65ccdecfb063d2c0a1dc00b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Apr 2023 08:55:29 +0200 Subject: [PATCH 316/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c0d415c..7ce4ba2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,11 +108,11 @@ pcre2 10.42-r0 apk pip 23.0.1 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python -python 3.10.10 binary -python3 3.10.10-r0 apk +python 3.10.11 binary +python3 3.10.11-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk -sdl2 2.26.3-r0 apk +sdl2 2.26.5-r0 apk setuptools 67.6.1 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk From 6334b84babea525cbcb9bce1c10a0ac6771fa326 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Apr 2023 16:20:55 -0500 Subject: [PATCH 317/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7ce4ba2..73d8495 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -82,7 +82,7 @@ libxcb 1.15-r0 apk libxdmcp 1.1.4-r0 apk libxext 1.3.5-r0 apk libxfixes 6.0.0-r0 apk -libxml2 2.10.3-r1 apk +libxml2 2.10.4-r0 apk libxslt 1.1.37-r1 apk libzen 0.4.39-r0 apk libzmq 4.3.4-r1 apk From 066b2cfa424265b532709a19559a4b63d019018a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Apr 2023 16:23:05 -0500 Subject: [PATCH 318/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 73d8495..ec78358 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,7 +15,7 @@ ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk -curl 7.88.1-r1 apk +curl 8.0.1-r0 apk dbus-libs 1.14.4-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk @@ -41,7 +41,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r3 apk -libcurl 7.88.1-r1 apk +libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-r0 apk @@ -105,7 +105,7 @@ opus 1.3.1-r1 apk orc 0.4.33-r0 apk p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk -pip 23.0.1 python +pip 23.1 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.11 binary From 9ef4046650135d56d5985785a68588e5fcbdadea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 21 Apr 2023 06:57:33 +0000 Subject: [PATCH 319/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ec78358..bc83caf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r3 apk +libcrypto3 3.0.8-r4 apk libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -66,7 +66,7 @@ libsndfile 1.1.0-r2 apk libsodium 1.0.18-r2 apk libsrt 1.5.1-r0 apk libssh 0.10.4-r0 apk -libssl3 3.0.8-r3 apk +libssl3 3.0.8-r4 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -113,7 +113,7 @@ python3 3.10.11-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk -setuptools 67.6.1 python +setuptools 67.7.0 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From bfa4e4c103b6a2301bc7778d80fcce2a260f100c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 22 Apr 2023 06:57:41 +0000 Subject: [PATCH 320/525] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bc83caf..f0ccc7a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,4 +1,5 @@ NAME VERSION TYPE +Pillow 9.5.0 python alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk @@ -113,7 +114,7 @@ python3 3.10.11-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk -setuptools 67.7.0 python +setuptools 67.7.1 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From 00e1a3fc018465bd076681c491843deb753f1830 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 22 Apr 2023 13:03:54 +0000 Subject: [PATCH 321/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f0ccc7a..8c0ff69 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ opus 1.3.1-r1 apk orc 0.4.33-r0 apk p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk -pip 23.1 python +pip 23.1.1 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.11 binary From 9b8fe2ecd227c54e1ef12b250a992a4e9100d3b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Apr 2023 16:19:32 -0500 Subject: [PATCH 322/525] Bot Updating Templated Files --- Jenkinsfile | 91 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7bb62fc..8a31ec4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,10 +42,11 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + sh '''docker pull quay.io/skopeo/stable:v1 || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:development 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -238,7 +239,7 @@ pipeline { script{ env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash docker run --rm \ -v ${WORKSPACE}:/mnt \ @@ -386,6 +387,26 @@ pipeline { } } } + // If this is a development build check the S6 service file perms + stage("Check S6 Service file Permissions"){ + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + sh '''#! /bin/bash + WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print) + if [[ -n "${WRONG_PERM}" ]]; then + echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}" + exit 1 + else + echo "S6 service file perms look good." + fi ''' + } + } + } /* ####################### GitLab Mirroring ####################### */ @@ -678,6 +699,7 @@ pipeline { ]) { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' } sh '''#! /bin/bash set -e @@ -704,8 +726,6 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -959,8 +979,67 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + } } } From 8aa65b17d91feeab4db7b65273ec245c5ef5c30b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Apr 2023 16:21:25 -0500 Subject: [PATCH 323/525] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 6 ++++-- .github/workflows/external_trigger.yml | 8 ++++++++ .../workflows/external_trigger_scheduler.yml | 18 ++++++++++-------- .github/workflows/package_trigger.yml | 4 ++++ .../workflows/package_trigger_scheduler.yml | 8 ++++---- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 87243e2..2c30784 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -2,9 +2,11 @@ name: Issue & PR Tracker on: issues: - types: [opened,reopened,labeled,unlabeled] + types: [opened,reopened,labeled,unlabeled,closed] pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] + pull_request_review: + types: [submitted,edited,dismissed] jobs: manage-project: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9330a0d..fc41f68 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -14,9 +14,11 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" + echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\". ****" + echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases" | jq -r '.[0] | .tag_name') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then @@ -30,6 +32,7 @@ jobs: fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" + echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving last pushed version ****" image="linuxserver/bazarr" tag="development" @@ -65,14 +68,18 @@ jobs: exit 1 fi echo "**** Last pushed version: ${IMAGE_VERSION} ****" + echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -82,6 +89,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 2f1117c..bbfe4c3 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: External Trigger Scheduler on: schedule: - - cron: '50 * * * *' + - cron: '16 * * * *' workflow_dispatch: jobs: @@ -17,18 +17,18 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "$br" == "$ls_branch" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml) + ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') + ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') + if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then + echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -36,8 +36,10 @@ jobs: https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/external_trigger.yml/dispatches else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 789a097..6dcf56a 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -14,13 +14,16 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** Package trigger running off of development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\". ****" + echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -30,6 +33,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index c9a4317..1939e1e 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -17,18 +17,16 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ @@ -38,9 +36,11 @@ jobs: sleep 30 else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" From 63db15dad7b7d9f55060f14289fc17db324fecdc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Apr 2023 16:28:26 -0500 Subject: [PATCH 324/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8c0ff69..133a6ce 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ netcat-openbsd 1.130-r4 apk nettle 3.8.1-r0 apk nghttp2-libs 1.51.0-r0 apk numactl 2.0.16-r1 apk -numpy 1.24.2 python +numpy 1.24.3 python oniguruma 6.9.8-r0 apk opus 1.3.1-r1 apk orc 0.4.33-r0 apk @@ -114,7 +114,7 @@ python3 3.10.11-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk -setuptools 67.7.1 python +setuptools 67.7.2 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From 0939c36bf8cceaaabdcd03401080c9633a8b1f12 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 May 2023 01:45:26 +0000 Subject: [PATCH 325/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 133a6ce..164501c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ opus 1.3.1-r1 apk orc 0.4.33-r0 apk p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk -pip 23.1.1 python +pip 23.1.2 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.11 binary From 3b615982b76185599afd85633cabae23433f3466 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 5 May 2023 06:32:27 +0000 Subject: [PATCH 326/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 164501c..b747502 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -66,7 +66,7 @@ librist 0.2.7-r0 apk libsndfile 1.1.0-r2 apk libsodium 1.0.18-r2 apk libsrt 1.5.1-r0 apk -libssh 0.10.4-r0 apk +libssh 0.10.5-r0 apk libssl3 3.0.8-r4 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk From 540dea7461e175882c9f64ccaee23dc5501c82ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 May 2023 06:32:47 +0000 Subject: [PATCH 327/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b747502..f15ef32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,8 +12,8 @@ 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 20220614-r4 apk -ca-certificates-bundle 20220614-r4 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk curl 8.0.1-r0 apk From 154ce91f0ec42a3f6f6150fd4ce5d0b27d578091 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 21 May 2023 06:31:47 +0000 Subject: [PATCH 328/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f15ef32..eba5dc6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk -curl 8.0.1-r0 apk +curl 8.1.0-r1 apk dbus-libs 1.14.4-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk @@ -42,7 +42,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r4 apk -libcurl 8.0.1-r0 apk +libcurl 8.1.0-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-r0 apk @@ -92,8 +92,8 @@ lxml 4.9.2 python mbedtls 2.28.3-r0 apk mediainfo 22.09-r0 apk mpdecimal 2.5.1-r1 apk -musl 1.2.3-r4 apk -musl-utils 1.2.3-r4 apk +musl 1.2.3-r5 apk +musl-utils 1.2.3-r5 apk ncurses-libs 6.3_p20221119-r0 apk ncurses-terminfo-base 6.3_p20221119-r0 apk netcat-openbsd 1.130-r4 apk @@ -114,7 +114,7 @@ python3 3.10.11-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk -setuptools 67.7.2 python +setuptools 67.8.0 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From f9f8f6a4c96c92ad1b56dc0748c3821c8d144eed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 21:18:55 +0000 Subject: [PATCH 329/525] Bot Updating Templated Files --- Jenkinsfile | 121 ++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a31ec4..7576207 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,12 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ - sh '''docker pull quay.io/skopeo/stable:v1 || : ''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -214,12 +219,12 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' @@ -347,6 +352,8 @@ pipeline { git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ @@ -438,8 +445,7 @@ pipeline { } steps{ sh '''#! /bin/bash - set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid' || :) if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ @@ -549,9 +555,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } stage('Build ARM64') { @@ -584,9 +593,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } } @@ -647,13 +659,6 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -671,13 +676,6 @@ pipeline { } } steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -778,17 +776,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:development || : - if [ -n "${SEMVER}" ]; then - docker rmi ${DELETEIMAGE}:${SEMVER} || : - fi - done - ''' } } } @@ -882,29 +869,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-development \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-development \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-development \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - if [ -n "${SEMVER}" ]; then - docker rmi \ - ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : - fi - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' } } } @@ -975,7 +939,6 @@ pipeline { stage('Pull Request Comment') { when { not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' environment name: 'EXIT_STATUS', value: '' } steps { @@ -1029,16 +992,24 @@ pipeline { echo "$escaped_table" } - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' } } @@ -1065,6 +1036,14 @@ pipeline { } } cleanup { + sh '''#! /bin/bash + echo "Performing docker system prune!!" + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : + ''' cleanWs() } } From 693bea627666a3e08119f22dff83d5933a3d8d35 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 May 2023 06:32:30 +0000 Subject: [PATCH 330/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index eba5dc6..87dcdf5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -25,7 +25,7 @@ fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk fribidi 1.0.12-r0 apk gdbm 1.23-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 graphite2 1.3.14-r2 apk @@ -76,7 +76,7 @@ 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 +libwebp 1.2.4-r2 apk libx11 1.8.4-r0 apk libxau 1.0.10-r0 apk libxcb 1.15-r0 apk From 719c0665ca9615773687eebeb8256cf374a060b9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 28 May 2023 06:30:51 +0000 Subject: [PATCH 331/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 87dcdf5..4a84c2e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk -curl 8.1.0-r1 apk +curl 8.1.1-r1 apk dbus-libs 1.14.4-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk @@ -42,7 +42,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r4 apk -libcurl 8.1.0-r1 apk +libcurl 8.1.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-r0 apk @@ -94,8 +94,8 @@ mediainfo 22.09-r0 apk mpdecimal 2.5.1-r1 apk musl 1.2.3-r5 apk musl-utils 1.2.3-r5 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 From bbef2aa286d7d3b4fd7c5612c14dd74130c5124b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 May 2023 21:19:07 +0000 Subject: [PATCH 332/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4a84c2e..91fee0b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,7 +41,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r4 apk +libcrypto3 3.0.9-r1 apk libcurl 8.1.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -67,7 +67,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.9-r1 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk From 1685d657d74c1233cc35599961472d990e003de4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Jun 2023 06:34:33 +0000 Subject: [PATCH 333/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91fee0b..a4dce29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk -curl 8.1.1-r1 apk +curl 8.1.2-r0 apk dbus-libs 1.14.4-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk @@ -42,7 +42,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.9-r1 apk -libcurl 8.1.1-r1 apk +libcurl 8.1.2-r0 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-r0 apk From 7747ce3d9e3301eb8efc4082d2f4c06b37d1b837 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 8 Jun 2023 06:34:29 +0000 Subject: [PATCH 334/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a4dce29..3593cc6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r3 apk coreutils 9.1-r0 apk curl 8.1.2-r0 apk -dbus-libs 1.14.4-r0 apk +dbus-libs 1.14.8-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk flac-libs 1.4.2-r0 apk From 2ea4e0f060fb6609c8f442bcebe9f373e680a28d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 11 Jun 2023 06:31:34 +0000 Subject: [PATCH 335/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3593cc6..9c245c6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -109,8 +109,8 @@ pcre2 10.42-r0 apk pip 23.1.2 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python -python 3.10.11 binary -python3 3.10.11-r0 apk +python 3.10.12 binary +python3 3.10.12-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk From 0c6f6b6834f75eab079a0e9431a1e961189c4f7d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 16 Jun 2023 06:32:21 +0000 Subject: [PATCH 336/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9c245c6..5d5390d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libvdpau 1.5-r0 apk libvorbis 1.3.7-r0 apk libvpx 1.12.0-r1 apk libwebp 1.2.4-r2 apk -libx11 1.8.4-r0 apk +libx11 1.8.4-r1 apk libxau 1.0.10-r0 apk libxcb 1.15-r0 apk libxdmcp 1.1.4-r0 apk From b463b962ecbfe763af97a2a39f13a46211e37ef4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Jun 2023 06:40:53 +0000 Subject: [PATCH 337/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5d5390d..9994e75 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Pillow 9.5.0 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.4-r0 apk alsa-lib 1.2.8-r0 apk aom-libs 3.5.0-r0 apk apk-tools 2.12.10-r1 apk @@ -100,7 +100,7 @@ netcat-openbsd 1.130-r4 apk nettle 3.8.1-r0 apk nghttp2-libs 1.51.0-r0 apk numactl 2.0.16-r1 apk -numpy 1.24.3 python +numpy 1.25.0 python oniguruma 6.9.8-r0 apk opus 1.3.1-r1 apk orc 0.4.33-r0 apk From 2c2850c490797c61b7c62d7f1ea20c16f32b6770 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Jun 2023 21:19:07 +0000 Subject: [PATCH 338/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9994e75..135db0b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -114,7 +114,7 @@ python3 3.10.12-r0 apk readline 8.2.0-r0 apk scanelf 1.3.5-r1 apk sdl2 2.26.5-r0 apk -setuptools 67.8.0 python +setuptools 68.0.0 python shadow 4.13-r0 apk skalibs 2.12.0.1-r0 apk soxr 0.1.3-r3 apk From adf3be23631fa191b58ffef04d98abe14135c538 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 06:34:43 +0000 Subject: [PATCH 339/525] Bot Updating Templated Files --- Jenkinsfile | 83 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 63 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7576207..bba0c1d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -173,7 +173,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -196,7 +196,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -219,7 +219,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } @@ -290,7 +290,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}" @@ -326,12 +326,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} @@ -525,44 +526,6 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bazarr/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bazarr\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bazarr\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Bazarr\" \ - --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''#! /bin/bash - containers=$(docker ps -aq) - if [[ -n "${containers}" ]]; then - docker stop ${containers} - fi - docker system prune -af --volumes || : ''' - } - } stage('Build ARM64') { agent { label 'ARM64' @@ -703,9 +666,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; 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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -808,8 +769,6 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin 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 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 @@ -817,49 +776,47 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development 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-development - 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-development docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-development - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-development - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-development docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker manifest push --purge ${MANIFESTIMAGE}:development || : - docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development - docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 if [ -n "${SEMVER}" ]; then docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi + token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-development") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development + fi docker manifest push --purge ${MANIFESTIMAGE}:development docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} From ca7c3efdb1f96d0e681771c40886d8ab18ef22f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 06:37:19 +0000 Subject: [PATCH 340/525] Bot Updating Templated Files --- Dockerfile.armhf | 83 ------------------------------------------------ 1 file changed, 83 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 2e735a4..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,83 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 - -# set version label -ARG UNRAR_VERSION=6.1.7 -ARG BUILD_DATE -ARG VERSION -ARG BAZARR_VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="chbmb" -# hard set UTC in case the user does not define it -ENV TZ="Etc/UTC" - -RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - cargo \ - libffi-dev \ - libpq-dev \ - libxml2-dev \ - libxslt-dev \ - python3-dev && \ - echo "**** install packages ****" && \ - apk add --no-cache \ - ffmpeg \ - libxml2 \ - libxslt \ - mediainfo \ - python3 && \ - echo "**** install unrar from source ****" && \ - mkdir /tmp/unrar && \ - curl -o \ - /tmp/unrar.tar.gz -L \ - "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ - tar xf \ - /tmp/unrar.tar.gz -C \ - /tmp/unrar --strip-components=1 && \ - cd /tmp/unrar && \ - make && \ - install -v -m755 unrar /usr/local/bin && \ - echo "**** install bazarr ****" && \ - mkdir -p \ - /app/bazarr/bin && \ - if [ -z ${BAZARR_VERSION+x} ]; then \ - BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \ - | jq -r '.[0] | .tag_name'); \ - fi && \ - curl -o \ - /tmp/bazarr.zip -L \ - "https://github.com/morpheus65535/bazarr/releases/download/${BAZARR_VERSION}/bazarr.zip" && \ - unzip \ - /tmp/bazarr.zip -d \ - /app/bazarr/bin && \ - rm -Rf /app/bazarr/bin/bin && \ - echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \ - curl -o \ - /app/bazarr/bin/postgres-requirements.txt -L \ - "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ - echo "**** Install requirements ****" && \ - 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/ \ - -r /app/bazarr/bin/requirements.txt \ - -r /app/bazarr/bin/postgres-requirements.txt && \ - echo "**** clean up ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - $HOME/.cache \ - $HOME/.cargo \ - /tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 6767 - -VOLUME /config From 1fe4bf5ad2a222bb1168dc87f4fcf672aa57994c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 06:38:52 +0000 Subject: [PATCH 341/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - README.md | 3 +- readme-vars.yml | 65 +++++++++++++--------------- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 59a10f5..ce3d19a 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -53,7 +53,6 @@ body: options: - x86-64 - arm64 - - armhf validations: required: true - type: textarea diff --git a/README.md b/README.md index c4e5a6b..871c78f 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ✅ | arm32v7-\<version tag\> | +| armhf | ❌ | | ## Application Setup @@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **17.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase development branch to Alpine 3.17. * **11.10.22:** - Rebase development branch to Alpine 3.16, migrate to s6v3. diff --git a/readme-vars.yml b/readme-vars.yml index 5f7fbe4..2bee21d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,13 +6,10 @@ project_url: "https://github.com/morpheus65535/bazarr" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" - # supported architectures available_architectures: - - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} - + - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} # Optional Block optional_block_1: true optional_block_1_items: @@ -20,50 +17,48 @@ optional_block_1_items: You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development The development tag will be the latest commit in the development branch of bazarr. - # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data" } - - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies" } - - { vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of your TV Shows" } + - {vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data"} + - {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies"} + - {vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of your TV Shows"} param_usage_include_ports: true param_ports: - - { external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver." } + - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} param_usage_include_env: true param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} + - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} # optional env variables opt_param_usage_include_env: false - # application setup block app_setup_block_enabled: true app_setup_block: | - Once running the URL will be `http://<host-ip>:6767`. - You must complete all the setup parameters in the webui before you can save the config. - # changelog changelogs: - - { date: "17.02.23:", desc: "Add dependencies for postgres support. Add mediainfo." } - - { date: "23.01.23:", desc: "Rebase development branch to Alpine 3.17." } - - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3." } - - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." } - - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." } - - { date: "22.10.21:", desc: "Added openblas package to prevent numpy error." } - - { date: "16.05.21:", desc: "Use wheel index." } - - { date: "19.04.21:", desc: "Install from release zip." } - - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin." } - - { date: "13.03.21:", desc: "Build from Github pre-releases." } - - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." } - - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." } - - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - - { date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - - { date: "13.06.19:", desc: "Add env variable for setting umask." } - - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - - { date: "11.09.18:", desc: "Initial release." } + - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} + - {date: "17.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} + - {date: "23.01.23:", desc: "Rebase development branch to Alpine 3.17."} + - {date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3."} + - {date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken."} + - {date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel."} + - {date: "22.10.21:", desc: "Added openblas package to prevent numpy error."} + - {date: "16.05.21:", desc: "Use wheel index."} + - {date: "19.04.21:", desc: "Install from release zip."} + - {date: "07.04.21:", desc: "Move app to /app/bazarr/bin."} + - {date: "13.03.21:", desc: "Build from Github pre-releases."} + - {date: "23.01.21:", desc: "Rebasing to alpine 3.13."} + - {date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."} + - {date: "19.12.19:", desc: "Rebasing to alpine 3.12."} + - {date: "13.05.20:", desc: "Add donation links for Bazarr to container log."} + - {date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles."} + - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."} + - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."} + - {date: "17.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe."} + - {date: "13.06.19:", desc: "Add env variable for setting umask."} + - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."} + - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."} + - {date: "11.09.18:", desc: "Initial release."} From 625fae062349ae54f4366a76ccb893955a4f7746 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 06:43:11 +0000 Subject: [PATCH 342/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 135db0b..85b5771 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -Pillow 9.5.0 python +Pillow 10.0.0 python alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk From af24ef6eddb5981e36cd552be8db8b97829dab15 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Jul 2023 06:38:16 +0000 Subject: [PATCH 343/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 85b5771..cd510c3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -88,7 +88,7 @@ libxslt 1.1.37-r1 apk libzen 0.4.39-r0 apk libzmq 4.3.4-r1 apk linux-pam 1.5.2-r1 apk -lxml 4.9.2 python +lxml 4.9.3 python mbedtls 2.28.3-r0 apk mediainfo 22.09-r0 apk mpdecimal 2.5.1-r1 apk From 571491513e770a82e60b2a9fc1f70ea96830c5e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Jul 2023 02:04:22 +0000 Subject: [PATCH 344/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cd510c3..6f75e73 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ netcat-openbsd 1.130-r4 apk nettle 3.8.1-r0 apk nghttp2-libs 1.51.0-r0 apk numactl 2.0.16-r1 apk -numpy 1.25.0 python +numpy 1.25.1 python oniguruma 6.9.8-r0 apk opus 1.3.1-r1 apk orc 0.4.33-r0 apk From 25bf7f1f7a0c819c011ba6d0a5fe6ee30deb5095 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Tue, 11 Jul 2023 11:09:33 +0100 Subject: [PATCH 345/525] Rebase to 3.18 (develop) --- Dockerfile | 10 +++++----- Dockerfile.aarch64 | 10 +++++----- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28b78ce..5d315d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.1.7 +ARG UNRAR_VERSION=6.2.8 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -59,11 +59,11 @@ RUN \ /app/bazarr/bin/postgres-requirements.txt -L \ "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ echo "**** Install requirements ****" && \ - python3 -m ensurepip && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b55882c..c2f0e6b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,9 +1,9 @@ # 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 -ARG UNRAR_VERSION=6.1.7 +ARG UNRAR_VERSION=6.2.8 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -59,11 +59,11 @@ RUN \ /app/bazarr/bin/postgres-requirements.txt -L \ "https://raw.githubusercontent.com/morpheus65535/bazarr/${BAZARR_VERSION}/postgres-requirements.txt" && \ echo "**** Install requirements ****" && \ - python3 -m ensurepip && \ - pip3 install -U --no-cache-dir \ + python3 -m venv /lsiopy && \ + pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ + pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ diff --git a/README.md b/README.md index 871c78f..0f16b27 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.07.23:** - Rebase to Alpine 3.18 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **17.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase development branch to Alpine 3.17. diff --git a/readme-vars.yml b/readme-vars.yml index 2bee21d..129524c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,6 +39,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: + - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "17.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} - {date: "23.01.23:", desc: "Rebase development branch to Alpine 3.17."} From 83f766fab923dc80540d10c269e77bbb9afb6d91 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Tue, 11 Jul 2023 11:11:57 +0100 Subject: [PATCH 346/525] Fix pips --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d315d4..8f537ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,7 +63,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c2f0e6b..1c93152 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -63,7 +63,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ From 3ca1872bbb013341acf0a3883107718c9391d999 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 12 Jul 2023 14:45:41 +0000 Subject: [PATCH 347/525] Bot Updating Package Versions --- package_versions.txt | 303 +++++++++++++++++++++++-------------------- 1 file changed, 164 insertions(+), 139 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6f75e73..da32145 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,139 +1,164 @@ -NAME VERSION TYPE -Pillow 10.0.0 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.4-r0 apk -alsa-lib 1.2.8-r0 apk -aom-libs 3.5.0-r0 apk -apk-tools 2.12.10-r1 apk -bash 5.2.15-r0 apk -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 -ca-certificates-bundle 20230506-r0 apk -cjson 1.7.15-r3 apk -coreutils 9.1-r0 apk -curl 8.1.2-r0 apk -dbus-libs 1.14.8-r0 apk -ffmpeg 5.1.3-r0 apk -ffmpeg-libs 5.1.3-r0 apk -flac-libs 1.4.2-r0 apk -fontconfig 2.14.1-r0 apk -freetype 2.12.1-r0 apk -fribidi 1.0.12-r0 apk -gdbm 1.23-r0 apk -glib 2.74.7-r0 apk -gmp 6.2.1-r2 apk -gnutls 3.7.8-r3 apk -graphite2 1.3.14-r2 apk -harfbuzz 5.3.1-r1 apk -hwdata-pci 0.364-r0 apk -jq 1.6-r2 apk -lame 3.100-r2 apk -libacl 2.3.1-r1 apk -libass 0.16.0-r1 apk -libasyncns 0.8-r1 apk -libattr 2.5.1-r2 apk -libblkid 2.38.1-r1 apk -libbsd 0.11.7-r0 apk -libbz2 1.0.8-r4 apk -libc-utils 0.7.2-r3 apk -libcrypto3 3.0.9-r1 apk -libcurl 8.1.2-r0 apk -libdav1d 1.0.0-r2 apk -libdrm 2.4.114-r0 apk -libexpat 2.5.0-r0 apk -libffi 3.4.4-r0 apk -libgcc 12.2.1_git20220924-r4 apk -libgcrypt 1.10.1-r0 apk -libgomp 12.2.1_git20220924-r4 apk -libgpg-error 1.46-r1 apk -libintl 0.21.1-r1 apk -libjpeg-turbo 2.1.4-r0 apk -libltdl 2.4.7-r1 apk -libmd 1.0.4-r0 apk -libmediainfo 22.09-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 -libproc 3.3.17-r2 apk -libpulse 16.1-r6 apk -librist 0.2.7-r0 apk -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.9-r1 apk -libstdc++ 12.2.1_git20220924-r4 apk -libtasn1 4.19.0-r0 apk -libtheora 1.1.1-r16 apk -libunistring 1.1-r0 apk -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-r2 apk -libx11 1.8.4-r1 apk -libxau 1.0.10-r0 apk -libxcb 1.15-r0 apk -libxdmcp 1.1.4-r0 apk -libxext 1.3.5-r0 apk -libxfixes 6.0.0-r0 apk -libxml2 2.10.4-r0 apk -libxslt 1.1.37-r1 apk -libzen 0.4.39-r0 apk -libzmq 4.3.4-r1 apk -linux-pam 1.5.2-r1 apk -lxml 4.9.3 python -mbedtls 2.28.3-r0 apk -mediainfo 22.09-r0 apk -mpdecimal 2.5.1-r1 apk -musl 1.2.3-r5 apk -musl-utils 1.2.3-r5 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 -numactl 2.0.16-r1 apk -numpy 1.25.1 python -oniguruma 6.9.8-r0 apk -opus 1.3.1-r1 apk -orc 0.4.33-r0 apk -p11-kit 0.24.1-r1 apk -pcre2 10.42-r0 apk -pip 23.1.2 python -procps 3.3.17-r2 apk -psycopg2-binary 2.9.6 python -python 3.10.12 binary -python3 3.10.12-r0 apk -readline 8.2.0-r0 apk -scanelf 1.3.5-r1 apk -sdl2 2.26.5-r0 apk -setuptools 68.0.0 python -shadow 4.13-r0 apk -skalibs 2.12.0.1-r0 apk -soxr 0.1.3-r3 apk -speexdsp 1.2.1-r0 apk -sqlite-libs 3.40.1-r0 apk -ssl_client 1.35.0-r29 apk -svt-av1-libs 1.3.0-r0 apk -tdb-libs 1.4.6-r0 apk -tinyxml2 9.0.0-r0 apk -tzdata 2023c-r0 apk -utmps-libs 0.1.2.0-r1 apk -v4l-utils-libs 1.22.1-r2 apk -vidstab 1.1.0-r2 apk -wayland-libs-client 1.21.0-r1 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.40.0 python -x264-libs 0.164_git20220602-r0 apk -x265-libs 3.5-r3 apk -xvidcore 1.3.7-r1 apk -xz 5.2.9-r0 apk -xz-libs 5.2.9-r0 apk -zlib 1.2.13-r0 apk +NAME VERSION TYPE +Pillow 10.0.0 python +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.2-r0 apk +alsa-lib 1.2.9-r1 apk +aom-libs 3.6.1-r0 apk +apk-tools 2.14.0-r2 apk +bash 5.2.15-r5 apk +brotli-libs 1.0.9-r14 apk +busybox 1.36.1 binary +busybox 1.36.1-r1 apk +busybox-binsh 1.36.1-r1 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cjson 1.7.15-r4 apk +coreutils 9.3-r1 apk +curl 8.1.2-r0 apk +dbus-libs 1.14.8-r0 apk +ffmpeg 6.0-r15 apk +ffmpeg-libavcodec 6.0-r15 apk +ffmpeg-libavdevice 6.0-r15 apk +ffmpeg-libavfilter 6.0-r15 apk +ffmpeg-libavformat 6.0-r15 apk +ffmpeg-libavutil 6.0-r15 apk +ffmpeg-libpostproc 6.0-r15 apk +ffmpeg-libswresample 6.0-r15 apk +ffmpeg-libswscale 6.0-r15 apk +flac-libs 1.4.3-r0 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fribidi 1.0.13-r0 apk +gdbm 1.23-r1 apk +glib 2.76.4-r0 apk +glslang-libs 1.3.243.0-r1 apk +gmp 6.2.1-r3 apk +gnutls 3.8.0-r2 apk +graphite2 1.3.14-r5 apk +harfbuzz 7.3.0-r0 apk +hwdata-pci 0.370-r0 apk +jq 1.6-r3 apk +lame-libs 3.100-r5 apk +lcms2 2.15-r2 apk +libacl 2.3.1-r3 apk +libass 0.17.1-r0 apk +libasyncns 0.8-r1 apk +libattr 2.5.1-r4 apk +libblkid 2.38.1-r8 apk +libbluray 1.3.4-r0 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.1-r1 apk +libcurl 8.1.2-r0 apk +libdav1d 1.2.1-r0 apk +libdrm 2.4.115-r4 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libgcrypt 1.10.2-r1 apk +libgomp 12.2.1_git20220924-r10 apk +libgpg-error 1.47-r1 apk +libhwy 1.0.4-r1 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r2 apk +libmd 1.0.4-r2 apk +libmediainfo 23.04-r0 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libogg 1.3.5-r4 apk +libopenmpt 0.7.2-r0 apk +libpanelw 6.4_p20230506-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 5.264.1-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.3-r1 apk +libpulse 16.1-r10 apk +librist 0.2.7-r0 apk +libsndfile 1.2.0-r2 apk +libsodium 1.0.18-r3 apk +libsrt 1.5.2-r0 apk +libssh 0.10.5-r0 apk +libssl3 3.1.1-r1 apk +libstdc++ 12.2.1_git20220924-r10 apk +libtasn1 4.19.0-r1 apk +libtheora 1.1.1-r17 apk +libunibreak 5.1-r0 apk +libunistring 1.1-r1 apk +libva 2.18.0-r1 apk +libvdpau 1.5-r1 apk +libvorbis 1.3.7-r1 apk +libvpx 1.13.0-r1 apk +libwebp 1.3.1-r0 apk +libx11 1.8.4-r4 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxfixes 6.0.1-r2 apk +libxml2 2.11.4-r0 apk +libxslt 1.1.38-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.4-r4 apk +linux-pam 1.5.2-r10 apk +lxml 4.9.3 python +mbedtls 2.28.3-r1 apk +mediainfo 23.04-r0 apk +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.31.3-r1 apk +musl 1.2.4-r0 apk +musl-utils 1.2.4-r0 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +netcat-openbsd 1.219-r1 apk +nettle 3.8.1-r2 apk +nghttp2-libs 1.53.0-r0 apk +numactl 2.0.16-r4 apk +numpy 1.25.1 python +onevpl-libs 2023.2.1-r0 apk +oniguruma 6.9.8-r1 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +p11-kit 0.24.1-r2 apk +pcre2 10.42-r1 apk +pip 23.1.2 python +procps-ng 4.0.3-r1 apk +psycopg2-binary 2.9.6 python +pyc 0.1-r0 apk +python 3.11.4 binary +python3 3.11.4-r0 apk +python3-pyc 3.11.4-r0 apk +python3-pycache-pyc0 3.11.4-r0 apk +readline 8.2.1-r1 apk +scanelf 1.3.7-r1 apk +sdl2 2.26.5-r0 apk +setuptools 68.0.0 python +shaderc 2023.3-r1 apk +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +soxr 0.1.3-r5 apk +speexdsp 1.2.1-r1 apk +spirv-tools 1.3.243.0-r1 apk +sqlite-libs 3.41.2-r2 apk +ssl_client 1.36.1-r1 apk +svt-av1-libs 1.6.0-r0 apk +tdb-libs 1.4.8-r1 apk +tinyxml2 9.0.0-r2 apk +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +v4l-utils-libs 1.24.1-r0 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.243.0-r1 apk +wayland-libs-client 1.22.0-r2 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.40.0 python +x264-libs 0.164_git20220602-r1 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r1 apk +xz-libs 5.4.3-r0 apk +zimg 3.0.5-r0 apk +zlib 1.2.13-r1 apk From f01786e03aa9b8bbfc963d86fc3fa31591bf255f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Jul 2023 06:37:56 +0000 Subject: [PATCH 348/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index da32145..762f76f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r1 apk +libcrypto3 3.1.1-r2 apk libcurl 8.1.2-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -84,7 +84,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.1-r1 apk +libssl3 3.1.1-r2 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk @@ -125,7 +125,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk -pip 23.1.2 python +pip 23.2 python procps-ng 4.0.3-r1 apk psycopg2-binary 2.9.6 python pyc 0.1-r0 apk From 7ba835b708ed2187f455b71c31c9054e2f1055ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 20 Jul 2023 06:32:06 +0000 Subject: [PATCH 349/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 762f76f..3ce265c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r2 apk +libcrypto3 3.1.1-r3 apk libcurl 8.1.2-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -84,7 +84,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.1-r2 apk +libssl3 3.1.1-r3 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk From 09370c3ebf08a842d3c652512e0d4e7bd4275f61 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 22 Jul 2023 14:28:32 +0000 Subject: [PATCH 350/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3ce265c..bc1497e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk coreutils 9.3-r1 apk -curl 8.1.2-r0 apk +curl 8.2.0-r1 apk dbus-libs 1.14.8-r0 apk ffmpeg 6.0-r15 apk ffmpeg-libavcodec 6.0-r15 apk @@ -52,7 +52,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.1-r3 apk -libcurl 8.1.2-r0 apk +libcurl 8.2.0-r1 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk libexpat 2.5.0-r1 apk @@ -116,7 +116,7 @@ musl-utils 1.2.4-r0 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk -nghttp2-libs 1.53.0-r0 apk +nghttp2-libs 1.55.1-r0 apk numactl 2.0.16-r4 apk numpy 1.25.1 python onevpl-libs 2023.2.1-r0 apk @@ -125,7 +125,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk -pip 23.2 python +pip 23.2.1 python procps-ng 4.0.3-r1 apk psycopg2-binary 2.9.6 python pyc 0.1-r0 apk @@ -155,7 +155,7 @@ vidstab 1.1.1-r0 apk vulkan-loader 1.3.243.0-r1 apk wayland-libs-client 1.22.0-r2 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.40.0 python +wheel 0.41.0 python x264-libs 0.164_git20220602-r1 apk x265-libs 3.5-r4 apk xvidcore 1.3.7-r1 apk From 94c7e993c7bb11731593eb94c2b8bf616d23072e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 28 Jul 2023 06:32:16 +0000 Subject: [PATCH 351/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bc1497e..cb58628 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -111,7 +111,7 @@ mbedtls 2.28.3-r1 apk mediainfo 23.04-r0 apk mpdecimal 2.5.1-r2 apk mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r0 apk +musl 1.2.4-r1 apk musl-utils 1.2.4-r0 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk From ffea3289b1c9b1bd815338091ebf56767f0deb72 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 31 Jul 2023 06:31:54 +0000 Subject: [PATCH 352/525] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cb58628..2490406 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,13 +10,13 @@ apk-tools 2.14.0-r2 apk bash 5.2.15-r5 apk brotli-libs 1.0.9-r14 apk busybox 1.36.1 binary -busybox 1.36.1-r1 apk -busybox-binsh 1.36.1-r1 apk +busybox 1.36.1-r2 apk +busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk coreutils 9.3-r1 apk -curl 8.2.0-r1 apk +curl 8.2.1-r0 apk dbus-libs 1.14.8-r0 apk ffmpeg 6.0-r15 apk ffmpeg-libavcodec 6.0-r15 apk @@ -52,7 +52,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.1-r3 apk -libcurl 8.2.0-r1 apk +libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk libexpat 2.5.0-r1 apk @@ -112,7 +112,7 @@ mediainfo 23.04-r0 apk mpdecimal 2.5.1-r2 apk mpg123-libs 1.31.3-r1 apk musl 1.2.4-r1 apk -musl-utils 1.2.4-r0 apk +musl-utils 1.2.4-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk @@ -144,7 +144,7 @@ soxr 0.1.3-r5 apk speexdsp 1.2.1-r1 apk spirv-tools 1.3.243.0-r1 apk sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r1 apk +ssl_client 1.36.1-r2 apk svt-av1-libs 1.6.0-r0 apk tdb-libs 1.4.8-r1 apk tinyxml2 9.0.0-r2 apk From 68b252d0fc9f00c88875c8c9221214d5e6d8d1d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Aug 2023 06:34:26 +0000 Subject: [PATCH 353/525] Bot Updating Package Versions --- package_versions.txt | 329 ++++++++++++++++++++++--------------------- 1 file changed, 165 insertions(+), 164 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2490406..cb1fe02 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,164 +1,165 @@ -NAME VERSION TYPE -Pillow 10.0.0 python -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.2-r0 apk -alsa-lib 1.2.9-r1 apk -aom-libs 3.6.1-r0 apk -apk-tools 2.14.0-r2 apk -bash 5.2.15-r5 apk -brotli-libs 1.0.9-r14 apk -busybox 1.36.1 binary -busybox 1.36.1-r2 apk -busybox-binsh 1.36.1-r2 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cjson 1.7.15-r4 apk -coreutils 9.3-r1 apk -curl 8.2.1-r0 apk -dbus-libs 1.14.8-r0 apk -ffmpeg 6.0-r15 apk -ffmpeg-libavcodec 6.0-r15 apk -ffmpeg-libavdevice 6.0-r15 apk -ffmpeg-libavfilter 6.0-r15 apk -ffmpeg-libavformat 6.0-r15 apk -ffmpeg-libavutil 6.0-r15 apk -ffmpeg-libpostproc 6.0-r15 apk -ffmpeg-libswresample 6.0-r15 apk -ffmpeg-libswscale 6.0-r15 apk -flac-libs 1.4.3-r0 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fribidi 1.0.13-r0 apk -gdbm 1.23-r1 apk -glib 2.76.4-r0 apk -glslang-libs 1.3.243.0-r1 apk -gmp 6.2.1-r3 apk -gnutls 3.8.0-r2 apk -graphite2 1.3.14-r5 apk -harfbuzz 7.3.0-r0 apk -hwdata-pci 0.370-r0 apk -jq 1.6-r3 apk -lame-libs 3.100-r5 apk -lcms2 2.15-r2 apk -libacl 2.3.1-r3 apk -libass 0.17.1-r0 apk -libasyncns 0.8-r1 apk -libattr 2.5.1-r4 apk -libblkid 2.38.1-r8 apk -libbluray 1.3.4-r0 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r3 apk -libcurl 8.2.1-r0 apk -libdav1d 1.2.1-r0 apk -libdrm 2.4.115-r4 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libgcrypt 1.10.2-r1 apk -libgomp 12.2.1_git20220924-r10 apk -libgpg-error 1.47-r1 apk -libhwy 1.0.4-r1 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r2 apk -libmd 1.0.4-r2 apk -libmediainfo 23.04-r0 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libogg 1.3.5-r4 apk -libopenmpt 0.7.2-r0 apk -libpanelw 6.4_p20230506-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 5.264.1-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.3-r1 apk -libpulse 16.1-r10 apk -librist 0.2.7-r0 apk -libsndfile 1.2.0-r2 apk -libsodium 1.0.18-r3 apk -libsrt 1.5.2-r0 apk -libssh 0.10.5-r0 apk -libssl3 3.1.1-r3 apk -libstdc++ 12.2.1_git20220924-r10 apk -libtasn1 4.19.0-r1 apk -libtheora 1.1.1-r17 apk -libunibreak 5.1-r0 apk -libunistring 1.1-r1 apk -libva 2.18.0-r1 apk -libvdpau 1.5-r1 apk -libvorbis 1.3.7-r1 apk -libvpx 1.13.0-r1 apk -libwebp 1.3.1-r0 apk -libx11 1.8.4-r4 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxfixes 6.0.1-r2 apk -libxml2 2.11.4-r0 apk -libxslt 1.1.38-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.4-r4 apk -linux-pam 1.5.2-r10 apk -lxml 4.9.3 python -mbedtls 2.28.3-r1 apk -mediainfo 23.04-r0 apk -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r1 apk -musl-utils 1.2.4-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -netcat-openbsd 1.219-r1 apk -nettle 3.8.1-r2 apk -nghttp2-libs 1.55.1-r0 apk -numactl 2.0.16-r4 apk -numpy 1.25.1 python -onevpl-libs 2023.2.1-r0 apk -oniguruma 6.9.8-r1 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -p11-kit 0.24.1-r2 apk -pcre2 10.42-r1 apk -pip 23.2.1 python -procps-ng 4.0.3-r1 apk -psycopg2-binary 2.9.6 python -pyc 0.1-r0 apk -python 3.11.4 binary -python3 3.11.4-r0 apk -python3-pyc 3.11.4-r0 apk -python3-pycache-pyc0 3.11.4-r0 apk -readline 8.2.1-r1 apk -scanelf 1.3.7-r1 apk -sdl2 2.26.5-r0 apk -setuptools 68.0.0 python -shaderc 2023.3-r1 apk -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -soxr 0.1.3-r5 apk -speexdsp 1.2.1-r1 apk -spirv-tools 1.3.243.0-r1 apk -sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r2 apk -svt-av1-libs 1.6.0-r0 apk -tdb-libs 1.4.8-r1 apk -tinyxml2 9.0.0-r2 apk -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -v4l-utils-libs 1.24.1-r0 apk -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.243.0-r1 apk -wayland-libs-client 1.22.0-r2 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.0 python -x264-libs 0.164_git20220602-r1 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r1 apk -xz-libs 5.4.3-r0 apk -zimg 3.0.5-r0 apk -zlib 1.2.13-r1 apk +NAME VERSION TYPE +Pillow 10.0.0 python +Simple Launcher Executable 1.1.0.14 dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.2-r0 apk +alsa-lib 1.2.9-r1 apk +aom-libs 3.6.1-r0 apk +apk-tools 2.14.0-r2 apk +bash 5.2.15-r5 apk +brotli-libs 1.0.9-r14 apk +busybox 1.36.1 binary +busybox 1.36.1-r2 apk +busybox-binsh 1.36.1-r2 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cjson 1.7.15-r4 apk +coreutils 9.3-r1 apk +curl 8.2.1-r0 apk +dbus-libs 1.14.8-r0 apk +ffmpeg 6.0-r15 apk +ffmpeg-libavcodec 6.0-r15 apk +ffmpeg-libavdevice 6.0-r15 apk +ffmpeg-libavfilter 6.0-r15 apk +ffmpeg-libavformat 6.0-r15 apk +ffmpeg-libavutil 6.0-r15 apk +ffmpeg-libpostproc 6.0-r15 apk +ffmpeg-libswresample 6.0-r15 apk +ffmpeg-libswscale 6.0-r15 apk +flac-libs 1.4.3-r0 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fribidi 1.0.13-r0 apk +gdbm 1.23-r1 apk +glib 2.76.4-r0 apk +glslang-libs 1.3.243.0-r1 apk +gmp 6.2.1-r3 apk +gnutls 3.8.0-r2 apk +graphite2 1.3.14-r5 apk +harfbuzz 7.3.0-r0 apk +hwdata-pci 0.370-r0 apk +jq 1.6-r3 apk +lame-libs 3.100-r5 apk +lcms2 2.15-r2 apk +libacl 2.3.1-r3 apk +libass 0.17.1-r0 apk +libasyncns 0.8-r1 apk +libattr 2.5.1-r4 apk +libblkid 2.38.1-r8 apk +libbluray 1.3.4-r0 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.1-r3 apk +libcurl 8.2.1-r0 apk +libdav1d 1.2.1-r0 apk +libdrm 2.4.115-r4 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libgcrypt 1.10.2-r1 apk +libgomp 12.2.1_git20220924-r10 apk +libgpg-error 1.47-r1 apk +libhwy 1.0.4-r1 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r2 apk +libmd 1.0.4-r2 apk +libmediainfo 23.04-r0 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libogg 1.3.5-r4 apk +libopenmpt 0.7.2-r0 apk +libpanelw 6.4_p20230506-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 5.264.1-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.3-r1 apk +libpulse 16.1-r10 apk +librist 0.2.7-r0 apk +libsndfile 1.2.0-r2 apk +libsodium 1.0.18-r3 apk +libsrt 1.5.2-r0 apk +libssh 0.10.5-r0 apk +libssl3 3.1.1-r3 apk +libstdc++ 12.2.1_git20220924-r10 apk +libtasn1 4.19.0-r1 apk +libtheora 1.1.1-r17 apk +libunibreak 5.1-r0 apk +libunistring 1.1-r1 apk +libva 2.18.0-r1 apk +libvdpau 1.5-r1 apk +libvorbis 1.3.7-r1 apk +libvpx 1.13.0-r1 apk +libwebp 1.3.1-r0 apk +libx11 1.8.4-r4 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxfixes 6.0.1-r2 apk +libxml2 2.11.4-r0 apk +libxslt 1.1.38-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.4-r4 apk +linux-pam 1.5.2-r10 apk +lxml 4.9.3 python +mbedtls 2.28.3-r1 apk +mediainfo 23.04-r0 apk +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.31.3-r1 apk +musl 1.2.4-r1 apk +musl-utils 1.2.4-r1 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +netcat-openbsd 1.219-r1 apk +nettle 3.8.1-r2 apk +nghttp2-libs 1.55.1-r0 apk +numactl 2.0.16-r4 apk +numpy 1.25.2 python +onevpl-libs 2023.2.1-r0 apk +oniguruma 6.9.8-r1 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +p11-kit 0.24.1-r2 apk +pcre2 10.42-r1 apk +pip 23.2.1 python +procps-ng 4.0.3-r1 apk +psycopg2-binary 2.9.6 python +pyc 0.1-r0 apk +python 3.11.4 binary +python3 3.11.4-r0 apk +python3-pyc 3.11.4-r0 apk +python3-pycache-pyc0 3.11.4-r0 apk +readline 8.2.1-r1 apk +scanelf 1.3.7-r1 apk +sdl2 2.26.5-r0 apk +setuptools 68.0.0 python +shaderc 2023.3-r1 apk +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +soxr 0.1.3-r5 apk +speexdsp 1.2.1-r1 apk +spirv-tools 1.3.243.0-r1 apk +sqlite-libs 3.41.2-r2 apk +ssl_client 1.36.1-r2 apk +svt-av1-libs 1.6.0-r0 apk +tdb-libs 1.4.8-r1 apk +tinyxml2 9.0.0-r2 apk +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +v4l-utils-libs 1.24.1-r0 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.243.0-r1 apk +wayland-libs-client 1.22.0-r2 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.41.0 python +x264-libs 0.164_git20220602-r1 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r1 apk +xz-libs 5.4.3-r0 apk +zimg 3.0.5-r0 apk +zlib 1.2.13-r1 apk From 66a90ccce5444cb340163aca69ba9a6d7049dcdf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 5 Aug 2023 06:30:46 +0000 Subject: [PATCH 354/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cb1fe02..1cf6f82 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r3 apk +libcrypto3 3.1.2-r0 apk libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -69,7 +69,7 @@ libjpeg-turbo 2.1.5.1-r3 apk libjxl 0.8.2-r0 apk libltdl 2.4.7-r2 apk libmd 1.0.4-r2 apk -libmediainfo 23.04-r0 apk +libmediainfo 23.07-r0 apk libmount 2.38.1-r8 apk libncursesw 6.4_p20230506-r0 apk libogg 1.3.5-r4 apk @@ -85,7 +85,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.1-r3 apk +libssl3 3.1.2-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk @@ -108,8 +108,8 @@ libzen 0.4.41-r0 apk libzmq 4.3.4-r4 apk linux-pam 1.5.2-r10 apk lxml 4.9.3 python -mbedtls 2.28.3-r1 apk -mediainfo 23.04-r0 apk +mbedtls 2.28.4-r0 apk +mediainfo 23.07-r0 apk mpdecimal 2.5.1-r2 apk mpg123-libs 1.31.3-r1 apk musl 1.2.4-r1 apk From fa081a30157d8ac465d39766f0d934143d607a3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Aug 2023 06:33:11 +0000 Subject: [PATCH 355/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1cf6f82..c32c5d2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk pip 23.2.1 python procps-ng 4.0.3-r1 apk -psycopg2-binary 2.9.6 python +psycopg2-binary 2.9.7 python pyc 0.1-r0 apk python 3.11.4 binary python3 3.11.4-r0 apk @@ -156,7 +156,7 @@ vidstab 1.1.1-r0 apk vulkan-loader 1.3.243.0-r1 apk wayland-libs-client 1.22.0-r2 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.0 python +wheel 0.41.1 python x264-libs 0.164_git20220602-r1 apk x265-libs 3.5-r4 apk xvidcore 1.3.7-r1 apk From b14d5d3581a0bbc1ca960f6153a374c5bd79c242 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Thu, 10 Aug 2023 17:45:45 +0100 Subject: [PATCH 356/525] Bump unrar to 6.2.10 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- readme-vars.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f537ad..1a7b16e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.2.8 +ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1c93152..c7161c7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label -ARG UNRAR_VERSION=6.2.8 +ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION diff --git a/readme-vars.yml b/readme-vars.yml index 129524c..4c4374a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,6 +39,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: + - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "17.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} From 8c43f04ed327b32cdf0fa1a0167ead02b5eddf29 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 10 Aug 2023 20:51:37 +0000 Subject: [PATCH 357/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0f16b27..781b048 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.08.23:** - Bump unrar to 6.2.10. * **11.07.23:** - Rebase to Alpine 3.18 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **17.02.23:** - Add dependencies for postgres support. Add mediainfo. From 647a24b4069ddbb2c68f56393e9a409f3f05af62 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 13 Aug 2023 06:29:33 +0000 Subject: [PATCH 358/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c32c5d2..2f394f7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ Simple Launcher Executable 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.2-r0 apk +alpine-release 3.18.3-r0 apk alsa-lib 1.2.9-r1 apk aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk From 4858a3110dc5e2258cd23e0b8ebe8ec1c32f269a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Aug 2023 06:30:38 +0000 Subject: [PATCH 359/525] Bot Updating Package Versions --- package_versions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2f394f7..dfeaf62 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,6 @@ aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk bash 5.2.15-r5 apk brotli-libs 1.0.9-r14 apk -busybox 1.36.1 binary busybox 1.36.1-r2 apk busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk From ce50b082f250cd107dcfbf5190013e67924ecc13 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Aug 2023 21:19:29 +0000 Subject: [PATCH 360/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index dfeaf62..345d367 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -136,7 +136,7 @@ python3-pycache-pyc0 3.11.4-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk -setuptools 68.0.0 python +setuptools 68.1.0 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From 38191759458fcb60dd6bb177669c2420db7ff3fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Aug 2023 06:31:25 +0000 Subject: [PATCH 361/525] Bot Updating Package Versions --- package_versions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 345d367..cb7c909 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,14 +129,13 @@ pip 23.2.1 python procps-ng 4.0.3-r1 apk psycopg2-binary 2.9.7 python pyc 0.1-r0 apk -python 3.11.4 binary python3 3.11.4-r0 apk python3-pyc 3.11.4-r0 apk python3-pycache-pyc0 3.11.4-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk -setuptools 68.1.0 python +setuptools 68.1.2 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From f9aed30618bc61984d074b3ed1841a93354e6963 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 22 Aug 2023 21:23:01 +0000 Subject: [PATCH 362/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cb7c909..8460bca 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ vidstab 1.1.1-r0 apk vulkan-loader 1.3.243.0-r1 apk wayland-libs-client 1.22.0-r2 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.1 python +wheel 0.41.2 python x264-libs 0.164_git20220602-r1 apk x265-libs 3.5-r4 apk xvidcore 1.3.7-r1 apk From a0e48ca515bd3c873599fb530d7e346942b9d8f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Aug 2023 21:19:20 +0000 Subject: [PATCH 363/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8460bca..fd50d32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,9 +129,9 @@ pip 23.2.1 python procps-ng 4.0.3-r1 apk psycopg2-binary 2.9.7 python pyc 0.1-r0 apk -python3 3.11.4-r0 apk -python3-pyc 3.11.4-r0 apk -python3-pycache-pyc0 3.11.4-r0 apk +python3 3.11.5-r0 apk +python3-pyc 3.11.5-r0 apk +python3-pycache-pyc0 3.11.5-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk From 32f57096378f3810109a2255d11f2fd172a46ed0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Sep 2023 06:32:09 +0000 Subject: [PATCH 364/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fd50d32..5283da2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libpanelw 6.4_p20230506-r0 apk libpciaccess 0.17-r2 apk libplacebo 5.264.1-r1 apk libpng 1.6.39-r3 apk -libproc2 4.0.3-r1 apk +libproc2 4.0.4-r0 apk libpulse 16.1-r10 apk librist 0.2.7-r0 apk libsndfile 1.2.0-r2 apk @@ -126,7 +126,7 @@ orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk pip 23.2.1 python -procps-ng 4.0.3-r1 apk +procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.7 python pyc 0.1-r0 apk python3 3.11.5-r0 apk From 7bb1bbddcc7b2924f19fc992dc9fa9f52233c797 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 7 Sep 2023 10:33:29 +0000 Subject: [PATCH 365/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5283da2..a1aab76 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -135,7 +135,7 @@ python3-pycache-pyc0 3.11.5-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk -setuptools 68.1.2 python +setuptools 68.2.0 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From 9ed72028265ea1842708b2fb2f88c500bab082fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Sep 2023 21:19:14 +0000 Subject: [PATCH 366/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a1aab76..757a255 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -135,7 +135,7 @@ python3-pycache-pyc0 3.11.5-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk -setuptools 68.2.0 python +setuptools 68.2.2 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From cf8c5c75c7a12e44461f9fc37ad878dc0453d136 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 15 Sep 2023 10:32:00 +0000 Subject: [PATCH 367/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 757a255..deb8733 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -94,7 +94,7 @@ libva 2.18.0-r1 apk libvdpau 1.5-r1 apk libvorbis 1.3.7-r1 apk libvpx 1.13.0-r1 apk -libwebp 1.3.1-r0 apk +libwebp 1.3.2-r0 apk libx11 1.8.4-r4 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk From 99d0579c7c173ab34ded2e11eaee7c3f7b130fc4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 16 Sep 2023 03:27:12 +0000 Subject: [PATCH 368/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index deb8733..a1d4181 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -Pillow 10.0.0 python +Pillow 10.0.1 python Simple Launcher Executable 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk From b972d960c4fc16b9ed56b230e7103c610a463883 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Tue, 19 Sep 2023 15:43:01 +0100 Subject: [PATCH 369/525] Add openblas, install unrar from linuxserver repo --- Dockerfile | 18 ++++++------------ Dockerfile.aarch64 | 18 ++++++------------ readme-vars.yml | 1 + 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a7b16e..efb85ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -28,18 +29,8 @@ RUN \ libxml2 \ libxslt \ mediainfo \ + openblas \ python3 && \ - echo "**** install unrar from source ****" && \ - mkdir /tmp/unrar && \ - curl -o \ - /tmp/unrar.tar.gz -L \ - "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ - tar xf \ - /tmp/unrar.tar.gz -C \ - /tmp/unrar --strip-components=1 && \ - cd /tmp/unrar && \ - make && \ - install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ mkdir -p \ /app/bazarr/bin && \ @@ -77,6 +68,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 6767 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c7161c7..49de0f9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1 +FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar + FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label -ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION @@ -28,18 +29,8 @@ RUN \ libxml2 \ libxslt \ mediainfo \ + openblas \ python3 && \ - echo "**** install unrar from source ****" && \ - mkdir /tmp/unrar && \ - curl -o \ - /tmp/unrar.tar.gz -L \ - "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \ - tar xf \ - /tmp/unrar.tar.gz -C \ - /tmp/unrar --strip-components=1 && \ - cd /tmp/unrar && \ - make && \ - install -v -m755 unrar /usr/local/bin && \ echo "**** install bazarr ****" && \ mkdir -p \ /app/bazarr/bin && \ @@ -77,6 +68,9 @@ RUN \ # add local files COPY root/ / +# add unrar +COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar + # ports and volumes EXPOSE 6767 diff --git a/readme-vars.yml b/readme-vars.yml index 4c4374a..f15e325 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,6 +39,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: + - {date: "19.09.23:", desc: "Add openblas, install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} From 1c49f2622784384492b487417ab7fa3a1c16d738 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Sep 2023 17:29:22 +0000 Subject: [PATCH 370/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a1d4181..9eaae52 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -118,7 +118,7 @@ netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk nghttp2-libs 1.55.1-r0 apk numactl 2.0.16-r4 apk -numpy 1.25.2 python +numpy 1.26.0 python onevpl-libs 2023.2.1-r0 apk oniguruma 6.9.8-r1 apk opus 1.4-r0 apk From 6473afdd49089d5623d3e26a3d1310e234f9fc0c Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Tue, 19 Sep 2023 20:05:56 +0100 Subject: [PATCH 371/525] Remove blas --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - readme-vars.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index efb85ec..85a8f97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN \ libxml2 \ libxslt \ mediainfo \ - openblas \ python3 && \ echo "**** install bazarr ****" && \ mkdir -p \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 49de0f9..a30cb1e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -29,7 +29,6 @@ RUN \ libxml2 \ libxslt \ mediainfo \ - openblas \ python3 && \ echo "**** install bazarr ****" && \ mkdir -p \ diff --git a/readme-vars.yml b/readme-vars.yml index f15e325..5a4c3d0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,7 +39,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: - - {date: "19.09.23:", desc: "Add openblas, install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} + - {date: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} From 73303edafcb0f4eff1595fa1ebc21ceea65baf1c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 20 Sep 2023 08:53:42 +0000 Subject: [PATCH 372/525] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 781b048..047fb02 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. * **11.07.23:** - Rebase to Alpine 3.18 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) From 5affa17b7fa64374998505502f23c990cf2c7e3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 21 Sep 2023 06:31:52 +0000 Subject: [PATCH 373/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9eaae52..07642a0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.2-r0 apk +libcrypto3 3.1.3-r0 apk libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -84,7 +84,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.2-r0 apk +libssl3 3.1.3-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk From 80233805e8b0b4150817ef5717e397f058d36505 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Sep 2023 06:33:08 +0000 Subject: [PATCH 374/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 07642a0..fdce2a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk coreutils 9.3-r1 apk -curl 8.2.1-r0 apk +curl 8.3.0-r0 apk dbus-libs 1.14.8-r0 apk ffmpeg 6.0-r15 apk ffmpeg-libavcodec 6.0-r15 apk @@ -52,7 +52,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.3-r0 apk -libcurl 8.2.1-r0 apk +libcurl 8.3.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk libexpat 2.5.0-r1 apk From 88a702d22b0832b5f83acd952b580896a8efe2da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 30 Sep 2023 06:30:20 +0000 Subject: [PATCH 375/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fdce2a2..847301f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libunistring 1.1-r1 apk libva 2.18.0-r1 apk libvdpau 1.5-r1 apk libvorbis 1.3.7-r1 apk -libvpx 1.13.0-r1 apk +libvpx 1.13.0-r2 apk libwebp 1.3.2-r0 apk libx11 1.8.4-r4 apk libxau 1.0.11-r2 apk @@ -127,7 +127,7 @@ p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk pip 23.2.1 python procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.7 python +psycopg2-binary 2.9.8 python pyc 0.1-r0 apk python3 3.11.5-r0 apk python3-pyc 3.11.5-r0 apk From 35c5a6601be35a736dc81a2bd051ca090c3f58be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 1 Oct 2023 06:32:10 +0000 Subject: [PATCH 376/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 847301f..cbaff7b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ Simple Launcher Executable 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.3-r0 apk +alpine-release 3.18.4-r0 apk alsa-lib 1.2.9-r1 apk aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk From e79d4ba9ecad15459f150df2aae5ffdf4e4b12ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 21:19:45 +0000 Subject: [PATCH 377/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cbaff7b..9006503 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -127,7 +127,7 @@ p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk pip 23.2.1 python procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.8 python +psycopg2-binary 2.9.9 python pyc 0.1-r0 apk python3 3.11.5-r0 apk python3-pyc 3.11.5-r0 apk From 4605fb4ba40acccfd2946f6aee08c7c9e43eccdf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 06:31:43 +0000 Subject: [PATCH 378/525] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bba0c1d..d6423bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -339,12 +338,12 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - mkdir -p ${TEMPDIR}/gitbook - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ - cd ${TEMPDIR}/gitbook/docker-documentation/ - git add images/docker-${CONTAINER_NAME}.md + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + git add docs/images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi @@ -435,35 +434,6 @@ pipeline { "visibility":"public"}' ''' } } - /* ####################### - Scarf.sh package registry - ####################### */ - // Add package to Scarf.sh and set permissions - stage("Scarf.sh package registry"){ - when { - branch "development" - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''#! /bin/bash - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bazarr") | .uuid' || :) - if [ -z "${PACKAGE_UUID}" ]; then - echo "Adding package to Scarf.sh" - curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{"name":"linuxserver/bazarr",\ - "shortDescription":"example description",\ - "libraryType":"docker",\ - "website":"https://github.com/linuxserver/docker-bazarr",\ - "backendUrl":"https://ghcr.io/linuxserver/bazarr",\ - "publicUrl":"https://lscr.io/linuxserver/bazarr"}' || : - else - echo "Package already exists on Scarf.sh" - fi - ''' - } - } /* ############### Build Container ############### */ @@ -859,6 +829,41 @@ pipeline { curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } } + // Add protection to the release branch + stage('Github-Release-Branch-Protection') { + when { + branch "development" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Setting up protection for release branch development" + sh '''#! /bin/bash + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/development/protection \ + -d $(jq -c . << EOF + { + "required_status_checks": null, + "enforce_admins": false, + "required_pull_request_reviews": { + "dismiss_stale_reviews": false, + "require_code_owner_reviews": false, + "require_last_push_approval": false, + "required_approving_review_count": 1 + }, + "restrictions": null, + "required_linear_history": false, + "allow_force_pushes": false, + "allow_deletions": false, + "block_creations": false, + "required_conversation_resolution": true, + "lock_branch": false, + "allow_fork_syncing": false, + "required_signatures": false + } +EOF + ) ''' + } + } // Use helper container to sync the current README on master to the dockerhub endpoint stage('Sync-README') { when { From 3708af5e56877a0b0d4cb1a0f1d9d9571f0d9e66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 06:34:12 +0000 Subject: [PATCH 379/525] Bot Updating Templated Files --- README.md | 136 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 047fb02..125795a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<!-- DO NOT EDIT THIS FILE MANUALLY --> -<!-- Please read the https://github.com/linuxserver/docker-bazarr/blob/development/.github/CONTRIBUTING.md --> - +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read https://github.com/linuxserver/docker-bazarr/blob/development/.github/CONTRIBUTING.md --> [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -65,7 +64,7 @@ The architectures supported by this image are: ## Usage -Here are some example snippets to help you get started creating a container. +To help you get started creating a container from this image you can either use docker-compose or the docker cli. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) @@ -103,16 +102,16 @@ docker run -d \ -v /path/to/tv:/tv \ --restart unless-stopped \ lscr.io/linuxserver/bazarr:development - ``` You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development The development tag will be the latest commit in the development branch of bazarr. + ## Parameters -Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. +Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. | Parameter | Function | | :----: | --- | @@ -131,10 +130,10 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: ```bash --e FILE__PASSWORD=/run/secrets/mysecretpassword +-e FILE__MYVAR=/run/secrets/mysecretvariable ``` -Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file. ## Umask for running applications @@ -143,15 +142,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu ## User / Group Identifiers -When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. +When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. -In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below: ```bash - $ id username - uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) +id your_user +``` + +Example output: + +```text +uid=1000(your_user) gid=1000(your_user) groups=1000(your_user) ``` ## Docker Mods @@ -162,12 +166,29 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Support Info -* Shell access whilst the container is running: `docker exec -it bazarr /bin/bash` -* To monitor the logs of the container in realtime: `docker logs -f bazarr` -* container version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bazarr` -* image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bazarr:development` +* Shell access whilst the container is running: + + ```bash + docker exec -it bazarr /bin/bash + ``` + +* To monitor the logs of the container in realtime: + + ```bash + docker logs -f bazarr + ``` + +* Container version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' bazarr + ``` + +* Image version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bazarr:development + ``` ## Updating Info @@ -177,38 +198,83 @@ Below are the instructions for updating containers: ### Via Docker Compose -* Update all images: `docker-compose pull` - * or update a single image: `docker-compose pull bazarr` -* Let compose update all containers as necessary: `docker-compose up -d` - * or update a single container: `docker-compose up -d bazarr` -* You can also remove the old dangling images: `docker image prune` +* Update images: + * All images: + + ```bash + docker-compose pull + ``` + + * Single image: + + ```bash + docker-compose pull bazarr + ``` + +* Update containers: + * All containers: + + ```bash + docker-compose up -d + ``` + + * Single container: + + ```bash + docker-compose up -d bazarr + ``` + +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/bazarr:development` -* Stop the running container: `docker stop bazarr` -* Delete the container: `docker rm bazarr` +* Update the image: + + ```bash + docker pull lscr.io/linuxserver/bazarr:development + ``` + +* Stop the running container: + + ```bash + docker stop bazarr + ``` + +* Delete the container: + + ```bash + docker rm bazarr + ``` + * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* You can also remove the old dangling images: `docker image prune` +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once bazarr - ``` + ```bash + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + containrrr/watchtower \ + --run-once bazarr + ``` * You can also remove the old dangling images: `docker image prune` -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). +**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) -* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 24c072349df79cfeb3cc8fe7f854b8ca85412ddd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 06:38:20 +0000 Subject: [PATCH 380/525] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9006503..4f3a220 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -107,12 +107,12 @@ libzen 0.4.41-r0 apk libzmq 4.3.4-r4 apk linux-pam 1.5.2-r10 apk lxml 4.9.3 python -mbedtls 2.28.4-r0 apk +mbedtls 2.28.5-r0 apk mediainfo 23.07-r0 apk mpdecimal 2.5.1-r2 apk mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r1 apk -musl-utils 1.2.4-r1 apk +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk @@ -129,9 +129,9 @@ pip 23.2.1 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python pyc 0.1-r0 apk -python3 3.11.5-r0 apk -python3-pyc 3.11.5-r0 apk -python3-pycache-pyc0 3.11.5-r0 apk +python3 3.11.6-r0 apk +python3-pyc 3.11.6-r0 apk +python3-pycache-pyc0 3.11.6-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk From eef6d0612abd08999044848cc306ca417163eb13 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 15 Oct 2023 06:32:07 +0000 Subject: [PATCH 381/525] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4f3a220..d757ea5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,13 +10,13 @@ aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk bash 5.2.15-r5 apk brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r2 apk -busybox-binsh 1.36.1-r2 apk +busybox 1.36.1-r4 apk +busybox-binsh 1.36.1-r4 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk coreutils 9.3-r1 apk -curl 8.3.0-r0 apk +curl 8.4.0-r0 apk dbus-libs 1.14.8-r0 apk ffmpeg 6.0-r15 apk ffmpeg-libavcodec 6.0-r15 apk @@ -52,7 +52,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.3-r0 apk -libcurl 8.3.0-r0 apk +libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk libexpat 2.5.0-r1 apk @@ -116,9 +116,9 @@ musl-utils 1.2.4-r2 apk ncurses-terminfo-base 6.4_p20230506-r0 apk netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk -nghttp2-libs 1.55.1-r0 apk +nghttp2-libs 1.57.0-r0 apk numactl 2.0.16-r4 apk -numpy 1.26.0 python +numpy 1.26.1 python onevpl-libs 2023.2.1-r0 apk oniguruma 6.9.8-r1 apk opus 1.4-r0 apk @@ -143,7 +143,7 @@ soxr 0.1.3-r5 apk speexdsp 1.2.1-r1 apk spirv-tools 1.3.243.0-r1 apk sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r2 apk +ssl_client 1.36.1-r4 apk svt-av1-libs 1.6.0-r0 apk tdb-libs 1.4.8-r1 apk tinyxml2 9.0.0-r2 apk From b2be5284b04e99d4847fe7a68f4b46dfe59e3755 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Oct 2023 06:33:04 +0000 Subject: [PATCH 382/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d757ea5..5328e7c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ NAME VERSION TYPE -Pillow 10.0.1 python +Pillow 10.1.0 python Simple Launcher Executable 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk @@ -125,7 +125,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk -pip 23.2.1 python +pip 23.3 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python pyc 0.1-r0 apk From 9cd1d1eb7f7171eb2794dd8777e5790a11ae5ed9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Oct 2023 21:21:30 +0000 Subject: [PATCH 383/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5328e7c..be74eb5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,7 +51,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.3-r0 apk +libcrypto3 3.1.4-r0 apk libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -84,7 +84,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.3-r0 apk +libssl3 3.1.4-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk @@ -125,7 +125,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk -pip 23.3 python +pip 23.3.1 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python pyc 0.1-r0 apk From c249255908cd25890de5acf83c18883c4e6ccd9f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 31 Oct 2023 21:20:12 +0000 Subject: [PATCH 384/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index be74eb5..addd8e0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ vidstab 1.1.1-r0 apk vulkan-loader 1.3.243.0-r1 apk wayland-libs-client 1.22.0-r2 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.2 python +wheel 0.41.3 python x264-libs 0.164_git20220602-r1 apk x265-libs 3.5-r4 apk xvidcore 1.3.7-r1 apk From b26a0f24fcf82757689a14d5ba33b4a215373c2e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 4 Nov 2023 06:30:17 +0000 Subject: [PATCH 385/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index addd8e0..78d47ce 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -95,7 +95,7 @@ libvdpau 1.5-r1 apk libvorbis 1.3.7-r1 apk libvpx 1.13.0-r2 apk libwebp 1.3.2-r0 apk -libx11 1.8.4-r4 apk +libx11 1.8.7-r0 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk From 8875a6c845058aa00f3d1c920edd84800f300817 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Nov 2023 21:21:40 +0000 Subject: [PATCH 386/525] Bot Updating Package Versions --- package_versions.txt | 326 +++++++++++++++++++++---------------------- 1 file changed, 163 insertions(+), 163 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 78d47ce..048cbd5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,163 +1,163 @@ -NAME VERSION TYPE -Pillow 10.1.0 python -Simple Launcher Executable 1.1.0.14 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.4-r0 apk -alsa-lib 1.2.9-r1 apk -aom-libs 3.6.1-r0 apk -apk-tools 2.14.0-r2 apk -bash 5.2.15-r5 apk -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r4 apk -busybox-binsh 1.36.1-r4 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cjson 1.7.15-r4 apk -coreutils 9.3-r1 apk -curl 8.4.0-r0 apk -dbus-libs 1.14.8-r0 apk -ffmpeg 6.0-r15 apk -ffmpeg-libavcodec 6.0-r15 apk -ffmpeg-libavdevice 6.0-r15 apk -ffmpeg-libavfilter 6.0-r15 apk -ffmpeg-libavformat 6.0-r15 apk -ffmpeg-libavutil 6.0-r15 apk -ffmpeg-libpostproc 6.0-r15 apk -ffmpeg-libswresample 6.0-r15 apk -ffmpeg-libswscale 6.0-r15 apk -flac-libs 1.4.3-r0 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fribidi 1.0.13-r0 apk -gdbm 1.23-r1 apk -glib 2.76.4-r0 apk -glslang-libs 1.3.243.0-r1 apk -gmp 6.2.1-r3 apk -gnutls 3.8.0-r2 apk -graphite2 1.3.14-r5 apk -harfbuzz 7.3.0-r0 apk -hwdata-pci 0.370-r0 apk -jq 1.6-r3 apk -lame-libs 3.100-r5 apk -lcms2 2.15-r2 apk -libacl 2.3.1-r3 apk -libass 0.17.1-r0 apk -libasyncns 0.8-r1 apk -libattr 2.5.1-r4 apk -libblkid 2.38.1-r8 apk -libbluray 1.3.4-r0 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r0 apk -libcurl 8.4.0-r0 apk -libdav1d 1.2.1-r0 apk -libdrm 2.4.115-r4 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libgcrypt 1.10.2-r1 apk -libgomp 12.2.1_git20220924-r10 apk -libgpg-error 1.47-r1 apk -libhwy 1.0.4-r1 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r2 apk -libmd 1.0.4-r2 apk -libmediainfo 23.07-r0 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libogg 1.3.5-r4 apk -libopenmpt 0.7.2-r0 apk -libpanelw 6.4_p20230506-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 5.264.1-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r10 apk -librist 0.2.7-r0 apk -libsndfile 1.2.0-r2 apk -libsodium 1.0.18-r3 apk -libsrt 1.5.2-r0 apk -libssh 0.10.5-r0 apk -libssl3 3.1.4-r0 apk -libstdc++ 12.2.1_git20220924-r10 apk -libtasn1 4.19.0-r1 apk -libtheora 1.1.1-r17 apk -libunibreak 5.1-r0 apk -libunistring 1.1-r1 apk -libva 2.18.0-r1 apk -libvdpau 1.5-r1 apk -libvorbis 1.3.7-r1 apk -libvpx 1.13.0-r2 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxfixes 6.0.1-r2 apk -libxml2 2.11.4-r0 apk -libxslt 1.1.38-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.4-r4 apk -linux-pam 1.5.2-r10 apk -lxml 4.9.3 python -mbedtls 2.28.5-r0 apk -mediainfo 23.07-r0 apk -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -netcat-openbsd 1.219-r1 apk -nettle 3.8.1-r2 apk -nghttp2-libs 1.57.0-r0 apk -numactl 2.0.16-r4 apk -numpy 1.26.1 python -onevpl-libs 2023.2.1-r0 apk -oniguruma 6.9.8-r1 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -p11-kit 0.24.1-r2 apk -pcre2 10.42-r1 apk -pip 23.3.1 python -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 0.1-r0 apk -python3 3.11.6-r0 apk -python3-pyc 3.11.6-r0 apk -python3-pycache-pyc0 3.11.6-r0 apk -readline 8.2.1-r1 apk -scanelf 1.3.7-r1 apk -sdl2 2.26.5-r0 apk -setuptools 68.2.2 python -shaderc 2023.3-r1 apk -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -soxr 0.1.3-r5 apk -speexdsp 1.2.1-r1 apk -spirv-tools 1.3.243.0-r1 apk -sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r4 apk -svt-av1-libs 1.6.0-r0 apk -tdb-libs 1.4.8-r1 apk -tinyxml2 9.0.0-r2 apk -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -v4l-utils-libs 1.24.1-r0 apk -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.243.0-r1 apk -wayland-libs-client 1.22.0-r2 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.3 python -x264-libs 0.164_git20220602-r1 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r1 apk -xz-libs 5.4.3-r0 apk -zimg 3.0.5-r0 apk -zlib 1.2.13-r1 apk +NAME VERSION TYPE +Pillow 10.1.0 python +SimpleLauncherExecutable 1.1.0.14 dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.4-r0 apk +alsa-lib 1.2.9-r1 apk +aom-libs 3.6.1-r0 apk +apk-tools 2.14.0-r2 apk +bash 5.2.15-r5 apk +brotli-libs 1.0.9-r14 apk +busybox 1.36.1-r4 apk +busybox-binsh 1.36.1-r4 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cjson 1.7.15-r4 apk +coreutils 9.3-r1 apk +curl 8.4.0-r0 apk +dbus-libs 1.14.8-r0 apk +ffmpeg 6.0-r15 apk +ffmpeg-libavcodec 6.0-r15 apk +ffmpeg-libavdevice 6.0-r15 apk +ffmpeg-libavfilter 6.0-r15 apk +ffmpeg-libavformat 6.0-r15 apk +ffmpeg-libavutil 6.0-r15 apk +ffmpeg-libpostproc 6.0-r15 apk +ffmpeg-libswresample 6.0-r15 apk +ffmpeg-libswscale 6.0-r15 apk +flac-libs 1.4.3-r0 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fribidi 1.0.13-r0 apk +gdbm 1.23-r1 apk +glib 2.76.4-r0 apk +glslang-libs 1.3.243.0-r1 apk +gmp 6.2.1-r3 apk +gnutls 3.8.0-r2 apk +graphite2 1.3.14-r5 apk +harfbuzz 7.3.0-r0 apk +hwdata-pci 0.370-r0 apk +jq 1.6-r3 apk +lame-libs 3.100-r5 apk +lcms2 2.15-r2 apk +libacl 2.3.1-r3 apk +libass 0.17.1-r0 apk +libasyncns 0.8-r1 apk +libattr 2.5.1-r4 apk +libblkid 2.38.1-r8 apk +libbluray 1.3.4-r0 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r0 apk +libcurl 8.4.0-r0 apk +libdav1d 1.2.1-r0 apk +libdrm 2.4.115-r4 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libgcrypt 1.10.2-r1 apk +libgomp 12.2.1_git20220924-r10 apk +libgpg-error 1.47-r1 apk +libhwy 1.0.4-r1 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r2 apk +libmd 1.0.4-r2 apk +libmediainfo 23.07-r0 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libogg 1.3.5-r4 apk +libopenmpt 0.7.2-r0 apk +libpanelw 6.4_p20230506-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 5.264.1-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.4-r0 apk +libpulse 16.1-r10 apk +librist 0.2.7-r0 apk +libsndfile 1.2.0-r2 apk +libsodium 1.0.18-r3 apk +libsrt 1.5.2-r0 apk +libssh 0.10.5-r0 apk +libssl3 3.1.4-r0 apk +libstdc++ 12.2.1_git20220924-r10 apk +libtasn1 4.19.0-r1 apk +libtheora 1.1.1-r17 apk +libunibreak 5.1-r0 apk +libunistring 1.1-r1 apk +libva 2.18.0-r1 apk +libvdpau 1.5-r1 apk +libvorbis 1.3.7-r1 apk +libvpx 1.13.0-r2 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxfixes 6.0.1-r2 apk +libxml2 2.11.4-r0 apk +libxslt 1.1.38-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.4-r4 apk +linux-pam 1.5.2-r10 apk +lxml 4.9.3 python +mbedtls 2.28.5-r0 apk +mediainfo 23.07-r0 apk +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.31.3-r1 apk +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +netcat-openbsd 1.219-r1 apk +nettle 3.8.1-r2 apk +nghttp2-libs 1.57.0-r0 apk +numactl 2.0.16-r4 apk +numpy 1.26.1 python +onevpl-libs 2023.2.1-r0 apk +oniguruma 6.9.8-r1 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +p11-kit 0.24.1-r2 apk +pcre2 10.42-r1 apk +pip 23.3.1 python +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 0.1-r0 apk +python3 3.11.6-r0 apk +python3-pyc 3.11.6-r0 apk +python3-pycache-pyc0 3.11.6-r0 apk +readline 8.2.1-r1 apk +scanelf 1.3.7-r1 apk +sdl2 2.26.5-r0 apk +setuptools 68.2.2 python +shaderc 2023.3-r1 apk +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +soxr 0.1.3-r5 apk +speexdsp 1.2.1-r1 apk +spirv-tools 1.3.243.0-r1 apk +sqlite-libs 3.41.2-r2 apk +ssl_client 1.36.1-r4 apk +svt-av1-libs 1.6.0-r0 apk +tdb-libs 1.4.8-r1 apk +tinyxml2 9.0.0-r2 apk +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +v4l-utils-libs 1.24.1-r0 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.243.0-r1 apk +wayland-libs-client 1.22.0-r2 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.41.3 python +x264-libs 0.164_git20220602-r1 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r1 apk +xz-libs 5.4.3-r0 apk +zimg 3.0.5-r0 apk +zlib 1.2.13-r1 apk From 477eb8f10a3338a39a50778c8b52bcc8a6a53f59 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Nov 2023 06:33:33 +0000 Subject: [PATCH 387/525] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 048cbd5..34b14b9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk bash 5.2.15-r5 apk brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r4 apk -busybox-binsh 1.36.1-r4 apk +busybox 1.36.1-r5 apk +busybox-binsh 1.36.1-r5 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk @@ -51,7 +51,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r0 apk +libcrypto3 3.1.4-r1 apk libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -84,7 +84,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.4-r0 apk +libssl3 3.1.4-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk @@ -118,7 +118,7 @@ netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk nghttp2-libs 1.57.0-r0 apk numactl 2.0.16-r4 apk -numpy 1.26.1 python +numpy 1.26.2 python onevpl-libs 2023.2.1-r0 apk oniguruma 6.9.8-r1 apk opus 1.4-r0 apk @@ -143,7 +143,7 @@ soxr 0.1.3-r5 apk speexdsp 1.2.1-r1 apk spirv-tools 1.3.243.0-r1 apk sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r4 apk +ssl_client 1.36.1-r5 apk svt-av1-libs 1.6.0-r0 apk tdb-libs 1.4.8-r1 apk tinyxml2 9.0.0-r2 apk From c3796d914502881b78224fe19f07d888614bc54d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 16 Nov 2023 06:32:01 +0000 Subject: [PATCH 388/525] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 125795a..a020553 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Find us at: ## Supported Architectures -We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `lscr.io/linuxserver/bazarr:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. From c36f8086f9e79cc9168c14230105b488a5b8ba82 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Nov 2023 21:23:17 +0000 Subject: [PATCH 389/525] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 34b14b9..7adb1d9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,15 +18,15 @@ cjson 1.7.15-r4 apk coreutils 9.3-r1 apk curl 8.4.0-r0 apk dbus-libs 1.14.8-r0 apk -ffmpeg 6.0-r15 apk -ffmpeg-libavcodec 6.0-r15 apk -ffmpeg-libavdevice 6.0-r15 apk -ffmpeg-libavfilter 6.0-r15 apk -ffmpeg-libavformat 6.0-r15 apk -ffmpeg-libavutil 6.0-r15 apk -ffmpeg-libpostproc 6.0-r15 apk -ffmpeg-libswresample 6.0-r15 apk -ffmpeg-libswscale 6.0-r15 apk +ffmpeg 6.0.1-r0 apk +ffmpeg-libavcodec 6.0.1-r0 apk +ffmpeg-libavdevice 6.0.1-r0 apk +ffmpeg-libavfilter 6.0.1-r0 apk +ffmpeg-libavformat 6.0.1-r0 apk +ffmpeg-libavutil 6.0.1-r0 apk +ffmpeg-libpostproc 6.0.1-r0 apk +ffmpeg-libswresample 6.0.1-r0 apk +ffmpeg-libswscale 6.0.1-r0 apk flac-libs 1.4.3-r0 apk fontconfig 2.14.2-r3 apk freetype 2.13.0-r5 apk @@ -101,7 +101,7 @@ libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk libxext 1.3.5-r2 apk libxfixes 6.0.1-r2 apk -libxml2 2.11.4-r0 apk +libxml2 2.11.6-r0 apk libxslt 1.1.38-r0 apk libzen 0.4.41-r0 apk libzmq 4.3.4-r4 apk @@ -135,7 +135,7 @@ python3-pycache-pyc0 3.11.6-r0 apk readline 8.2.1-r1 apk scanelf 1.3.7-r1 apk sdl2 2.26.5-r0 apk -setuptools 68.2.2 python +setuptools 69.0.2 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From 7a0f4ae92f39f8ab7e3d90ac8bb87579eb44ed99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Nov 2023 12:47:28 +0000 Subject: [PATCH 390/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7adb1d9..cd9660b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -154,7 +154,7 @@ vidstab 1.1.1-r0 apk vulkan-loader 1.3.243.0-r1 apk wayland-libs-client 1.22.0-r2 apk webrtcvad-wheels 2.0.11.post1 python -wheel 0.41.3 python +wheel 0.42.0 python x264-libs 0.164_git20220602-r1 apk x265-libs 3.5-r4 apk xvidcore 1.3.7-r1 apk From b9013402ef117a343c026feed4b94e2acce70e1d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 3 Dec 2023 06:30:18 +0000 Subject: [PATCH 391/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cd9660b..cdecb58 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ SimpleLauncherExecutable 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.4-r0 apk +alpine-release 3.18.5-r0 apk alsa-lib 1.2.9-r1 apk aom-libs 3.6.1-r0 apk apk-tools 2.14.0-r2 apk From 3195b0caa14298888ef47d93889a24986300111e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 9 Dec 2023 06:32:44 +0000 Subject: [PATCH 392/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cdecb58..9c04fd4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cjson 1.7.15-r4 apk coreutils 9.3-r1 apk -curl 8.4.0-r0 apk +curl 8.5.0-r0 apk dbus-libs 1.14.8-r0 apk ffmpeg 6.0.1-r0 apk ffmpeg-libavcodec 6.0.1-r0 apk @@ -52,7 +52,7 @@ libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.4-r1 apk -libcurl 8.4.0-r0 apk +libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk libexpat 2.5.0-r1 apk From bf0cc67b37eeee446a5f02690a8562fa3eea52b0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Dec 2023 06:32:49 +0000 Subject: [PATCH 393/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9c04fd4..5c6ac09 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ gnutls 3.8.0-r2 apk graphite2 1.3.14-r5 apk harfbuzz 7.3.0-r0 apk hwdata-pci 0.370-r0 apk -jq 1.6-r3 apk +jq 1.6-r4 apk lame-libs 3.100-r5 apk lcms2 2.15-r2 apk libacl 2.3.1-r3 apk From 10774e60f927d6cf9582ba4d46014984ba3e98b8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Dec 2023 21:19:00 +0000 Subject: [PATCH 394/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5c6ac09..ad88dea 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libxslt 1.1.38-r0 apk libzen 0.4.41-r0 apk libzmq 4.3.4-r4 apk linux-pam 1.5.2-r10 apk -lxml 4.9.3 python +lxml 4.9.4 python mbedtls 2.28.5-r0 apk mediainfo 23.07-r0 apk mpdecimal 2.5.1-r2 apk @@ -125,7 +125,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk -pip 23.3.1 python +pip 23.3.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python pyc 0.1-r0 apk From dc4ae547601a6b978098183a033ec34c66d3b087 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sat, 23 Dec 2023 18:08:30 -0600 Subject: [PATCH 395/525] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com> --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- readme-vars.yml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85a8f97..e71de9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.19 # set version label ARG BUILD_DATE @@ -53,7 +53,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.18/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a30cb1e..32bb1da 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -53,7 +53,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.18/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ echo "**** clean up ****" && \ diff --git a/readme-vars.yml b/readme-vars.yml index 5a4c3d0..a24f57b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,9 +21,7 @@ optional_block_1_items: param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - {vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data"} - - {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies"} - - {vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of your TV Shows"} + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} @@ -39,6 +37,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} From 32b329fd225352bea3e71efb304b19754b57c080 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Dec 2023 21:19:27 +0000 Subject: [PATCH 396/525] Bot Updating Package Versions --- package_versions.txt | 326 +++++++++++++++++++++---------------------- 1 file changed, 163 insertions(+), 163 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ad88dea..5ee3486 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,163 +1,163 @@ -NAME VERSION TYPE -Pillow 10.1.0 python -SimpleLauncherExecutable 1.1.0.14 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.5-r0 apk -alsa-lib 1.2.9-r1 apk -aom-libs 3.6.1-r0 apk -apk-tools 2.14.0-r2 apk -bash 5.2.15-r5 apk -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r5 apk -busybox-binsh 1.36.1-r5 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cjson 1.7.15-r4 apk -coreutils 9.3-r1 apk -curl 8.5.0-r0 apk -dbus-libs 1.14.8-r0 apk -ffmpeg 6.0.1-r0 apk -ffmpeg-libavcodec 6.0.1-r0 apk -ffmpeg-libavdevice 6.0.1-r0 apk -ffmpeg-libavfilter 6.0.1-r0 apk -ffmpeg-libavformat 6.0.1-r0 apk -ffmpeg-libavutil 6.0.1-r0 apk -ffmpeg-libpostproc 6.0.1-r0 apk -ffmpeg-libswresample 6.0.1-r0 apk -ffmpeg-libswscale 6.0.1-r0 apk -flac-libs 1.4.3-r0 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fribidi 1.0.13-r0 apk -gdbm 1.23-r1 apk -glib 2.76.4-r0 apk -glslang-libs 1.3.243.0-r1 apk -gmp 6.2.1-r3 apk -gnutls 3.8.0-r2 apk -graphite2 1.3.14-r5 apk -harfbuzz 7.3.0-r0 apk -hwdata-pci 0.370-r0 apk -jq 1.6-r4 apk -lame-libs 3.100-r5 apk -lcms2 2.15-r2 apk -libacl 2.3.1-r3 apk -libass 0.17.1-r0 apk -libasyncns 0.8-r1 apk -libattr 2.5.1-r4 apk -libblkid 2.38.1-r8 apk -libbluray 1.3.4-r0 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r1 apk -libcurl 8.5.0-r0 apk -libdav1d 1.2.1-r0 apk -libdrm 2.4.115-r4 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libgcrypt 1.10.2-r1 apk -libgomp 12.2.1_git20220924-r10 apk -libgpg-error 1.47-r1 apk -libhwy 1.0.4-r1 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r2 apk -libmd 1.0.4-r2 apk -libmediainfo 23.07-r0 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libogg 1.3.5-r4 apk -libopenmpt 0.7.2-r0 apk -libpanelw 6.4_p20230506-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 5.264.1-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r10 apk -librist 0.2.7-r0 apk -libsndfile 1.2.0-r2 apk -libsodium 1.0.18-r3 apk -libsrt 1.5.2-r0 apk -libssh 0.10.5-r0 apk -libssl3 3.1.4-r1 apk -libstdc++ 12.2.1_git20220924-r10 apk -libtasn1 4.19.0-r1 apk -libtheora 1.1.1-r17 apk -libunibreak 5.1-r0 apk -libunistring 1.1-r1 apk -libva 2.18.0-r1 apk -libvdpau 1.5-r1 apk -libvorbis 1.3.7-r1 apk -libvpx 1.13.0-r2 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxfixes 6.0.1-r2 apk -libxml2 2.11.6-r0 apk -libxslt 1.1.38-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.4-r4 apk -linux-pam 1.5.2-r10 apk -lxml 4.9.4 python -mbedtls 2.28.5-r0 apk -mediainfo 23.07-r0 apk -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -netcat-openbsd 1.219-r1 apk -nettle 3.8.1-r2 apk -nghttp2-libs 1.57.0-r0 apk -numactl 2.0.16-r4 apk -numpy 1.26.2 python -onevpl-libs 2023.2.1-r0 apk -oniguruma 6.9.8-r1 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -p11-kit 0.24.1-r2 apk -pcre2 10.42-r1 apk -pip 23.3.2 python -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 0.1-r0 apk -python3 3.11.6-r0 apk -python3-pyc 3.11.6-r0 apk -python3-pycache-pyc0 3.11.6-r0 apk -readline 8.2.1-r1 apk -scanelf 1.3.7-r1 apk -sdl2 2.26.5-r0 apk -setuptools 69.0.2 python -shaderc 2023.3-r1 apk -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -soxr 0.1.3-r5 apk -speexdsp 1.2.1-r1 apk -spirv-tools 1.3.243.0-r1 apk -sqlite-libs 3.41.2-r2 apk -ssl_client 1.36.1-r5 apk -svt-av1-libs 1.6.0-r0 apk -tdb-libs 1.4.8-r1 apk -tinyxml2 9.0.0-r2 apk -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -v4l-utils-libs 1.24.1-r0 apk -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.243.0-r1 apk -wayland-libs-client 1.22.0-r2 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.42.0 python -x264-libs 0.164_git20220602-r1 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r1 apk -xz-libs 5.4.3-r0 apk -zimg 3.0.5-r0 apk -zlib 1.2.13-r1 apk +NAME VERSION TYPE +Pillow 10.1.0 python +Simple Launcher 1.1.0.14 dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.5-r0 apk +alsa-lib 1.2.9-r1 apk +aom-libs 3.6.1-r0 apk +apk-tools 2.14.0-r2 apk +bash 5.2.15-r5 apk +brotli-libs 1.0.9-r14 apk +busybox 1.36.1-r5 apk +busybox-binsh 1.36.1-r5 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cjson 1.7.15-r4 apk +coreutils 9.3-r1 apk +curl 8.5.0-r0 apk +dbus-libs 1.14.8-r0 apk +ffmpeg 6.0.1-r0 apk +ffmpeg-libavcodec 6.0.1-r0 apk +ffmpeg-libavdevice 6.0.1-r0 apk +ffmpeg-libavfilter 6.0.1-r0 apk +ffmpeg-libavformat 6.0.1-r0 apk +ffmpeg-libavutil 6.0.1-r0 apk +ffmpeg-libpostproc 6.0.1-r0 apk +ffmpeg-libswresample 6.0.1-r0 apk +ffmpeg-libswscale 6.0.1-r0 apk +flac-libs 1.4.3-r0 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fribidi 1.0.13-r0 apk +gdbm 1.23-r1 apk +glib 2.76.4-r0 apk +glslang-libs 1.3.243.0-r1 apk +gmp 6.2.1-r3 apk +gnutls 3.8.0-r2 apk +graphite2 1.3.14-r5 apk +harfbuzz 7.3.0-r0 apk +hwdata-pci 0.370-r0 apk +jq 1.6-r4 apk +lame-libs 3.100-r5 apk +lcms2 2.15-r2 apk +libacl 2.3.1-r3 apk +libass 0.17.1-r0 apk +libasyncns 0.8-r1 apk +libattr 2.5.1-r4 apk +libblkid 2.38.1-r8 apk +libbluray 1.3.4-r0 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r1 apk +libcurl 8.5.0-r0 apk +libdav1d 1.2.1-r0 apk +libdrm 2.4.115-r4 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libgcrypt 1.10.2-r1 apk +libgomp 12.2.1_git20220924-r10 apk +libgpg-error 1.47-r1 apk +libhwy 1.0.4-r1 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r2 apk +libmd 1.0.4-r2 apk +libmediainfo 23.07-r0 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libogg 1.3.5-r4 apk +libopenmpt 0.7.2-r0 apk +libpanelw 6.4_p20230506-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 5.264.1-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.4-r0 apk +libpulse 16.1-r10 apk +librist 0.2.7-r0 apk +libsndfile 1.2.0-r2 apk +libsodium 1.0.18-r3 apk +libsrt 1.5.2-r0 apk +libssh 0.10.5-r0 apk +libssl3 3.1.4-r1 apk +libstdc++ 12.2.1_git20220924-r10 apk +libtasn1 4.19.0-r1 apk +libtheora 1.1.1-r17 apk +libunibreak 5.1-r0 apk +libunistring 1.1-r1 apk +libva 2.18.0-r1 apk +libvdpau 1.5-r1 apk +libvorbis 1.3.7-r1 apk +libvpx 1.13.0-r2 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxfixes 6.0.1-r2 apk +libxml2 2.11.6-r0 apk +libxslt 1.1.38-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.4-r4 apk +linux-pam 1.5.2-r10 apk +lxml 4.9.4 python +mbedtls 2.28.5-r0 apk +mediainfo 23.07-r0 apk +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.31.3-r1 apk +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +netcat-openbsd 1.219-r1 apk +nettle 3.8.1-r2 apk +nghttp2-libs 1.57.0-r0 apk +numactl 2.0.16-r4 apk +numpy 1.26.2 python +onevpl-libs 2023.2.1-r0 apk +oniguruma 6.9.8-r1 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +p11-kit 0.24.1-r2 apk +pcre2 10.42-r1 apk +pip 23.3.2 python +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 0.1-r0 apk +python3 3.11.6-r0 apk +python3-pyc 3.11.6-r0 apk +python3-pycache-pyc0 3.11.6-r0 apk +readline 8.2.1-r1 apk +scanelf 1.3.7-r1 apk +sdl2 2.26.5-r0 apk +setuptools 69.0.3 python +shaderc 2023.3-r1 apk +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +soxr 0.1.3-r5 apk +speexdsp 1.2.1-r1 apk +spirv-tools 1.3.243.0-r1 apk +sqlite-libs 3.41.2-r2 apk +ssl_client 1.36.1-r5 apk +svt-av1-libs 1.6.0-r0 apk +tdb-libs 1.4.8-r1 apk +tinyxml2 9.0.0-r2 apk +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +v4l-utils-libs 1.24.1-r0 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.243.0-r1 apk +wayland-libs-client 1.22.0-r2 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.42.0 python +x264-libs 0.164_git20220602-r1 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r1 apk +xz-libs 5.4.3-r0 apk +zimg 3.0.5-r0 apk +zlib 1.2.13-r1 apk From e6e5803c37bbc6781b0b09503a91f3a04ed4c4f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 Jan 2024 06:34:49 +0000 Subject: [PATCH 397/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5ee3486..81290c5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -147,7 +147,7 @@ ssl_client 1.36.1-r5 apk svt-av1-libs 1.6.0-r0 apk tdb-libs 1.4.8-r1 apk tinyxml2 9.0.0-r2 apk -tzdata 2023c-r1 apk +tzdata 2023d-r0 apk utmps-libs 0.1.2.1-r1 apk v4l-utils-libs 1.24.1-r0 apk vidstab 1.1.1-r0 apk From 129e26b555841823a0d6d7c5a85356140e3c307d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Jan 2024 21:20:03 +0000 Subject: [PATCH 398/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 81290c5..06c7bba 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,4 @@ NAME VERSION TYPE -Pillow 10.1.0 python Simple Launcher 1.1.0.14 dotnet alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk @@ -125,6 +124,7 @@ opus 1.4-r0 apk orc 0.4.34-r0 apk p11-kit 0.24.1-r2 apk pcre2 10.42-r1 apk +pillow 10.2.0 python pip 23.3.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python From 39c1b0a450589adc1b72acbb36dea0766c9c77d5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 3 Jan 2024 06:32:06 +0000 Subject: [PATCH 399/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 06c7bba..694e421 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -117,7 +117,7 @@ netcat-openbsd 1.219-r1 apk nettle 3.8.1-r2 apk nghttp2-libs 1.57.0-r0 apk numactl 2.0.16-r4 apk -numpy 1.26.2 python +numpy 1.26.3 python onevpl-libs 2023.2.1-r0 apk oniguruma 6.9.8-r1 apk opus 1.4-r0 apk From 11162c8a6aa5f70194ba4216acc061b71f412acd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jan 2024 21:19:38 +0000 Subject: [PATCH 400/525] Bot Updating Templated Files --- Jenkinsfile | 295 +++++++++++++++++++++++++++------------------------- 1 file changed, 152 insertions(+), 143 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6423bd..9ff330e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -61,11 +62,16 @@ pipeline { env.COMMIT_SHA = sh( script: '''git rev-parse HEAD''', returnStdout: true).trim() + env.GH_DEFAULT_BRANCH = sh( + script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''', + returnStdout: true).trim() 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' } + sh '''#! /bin/bash + echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ env.LS_RELEASE_NUMBER = sh( script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', @@ -130,7 +136,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''', returnStdout: true).trim() def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ @@ -148,7 +154,7 @@ pipeline { } if (env.SEMVER != null) { - if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") { env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" } println("SEMVER: ${env.SEMVER}") @@ -266,115 +272,150 @@ pipeline { } } steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - 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} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - 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 Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi - done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - 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} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - 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 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} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' + echo "Jenkinsfile is up to date." fi - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() + # 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 Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + 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 readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + fi + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" + else + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" + fi + DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + else + echo "Not the default Github branch. Skipping readme sync to Docker Hub." + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } } } } @@ -568,7 +609,8 @@ pipeline { wait git add package_versions.txt git commit -m 'Bot Updating Package Versions' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -864,39 +906,6 @@ EOF ) ''' } } - // Use helper container to sync the current README on master to the dockerhub endpoint - stage('Sync-README') { - when { - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/readme-sync - docker run --rm=true \ - -e DOCKERHUB_USERNAME=$DOCKERUSER \ - -e DOCKERHUB_PASSWORD=$DOCKERPASS \ - -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ - -e DOCKER_REPOSITORY=${IMAGE} \ - -e GIT_BRANCH=master \ - -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/readme-sync bash -c 'node sync' - rm -Rf ${TEMPDIR} ''' - } - } - } // If this is a Pull request send the CI link as a comment on it stage('Pull Request Comment') { when { From 1bb341d1928e994e59ec87d2f56a5a8f00abbbaa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jan 2024 21:21:23 +0000 Subject: [PATCH 401/525] Bot Updating Templated Files --- README.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/README.md b/README.md index a020553..04e701f 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,6 @@ To help you get started creating a container from this image you can either use ```yaml --- -version: "2.1" services: bazarr: image: lscr.io/linuxserver/bazarr:development @@ -192,7 +191,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. Below are the instructions for updating containers: @@ -257,21 +256,6 @@ Below are the instructions for updating containers: docker image prune ``` -### Via Watchtower auto-updater (only use if you don't remember the original parameters) - -* Pull the latest image at its tag and replace it with the same env variables in one run: - - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once bazarr - ``` - -* You can also remove the old dangling images: `docker image prune` - -**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). - ### Image Update Notifications - Diun (Docker Image Update Notifier) **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. From 4cb6bdaa1e904a036a43902d767377a9b366f564 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 13 Jan 2024 06:31:56 +0000 Subject: [PATCH 402/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 694e421..fd277fb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r1 apk +libcrypto3 3.1.4-r3 apk libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -83,7 +83,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.4-r1 apk +libssl3 3.1.4-r3 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk From 58755d0c22db1696c9259ffd9e1943d64efc2ad5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 16 Jan 2024 21:22:44 +0000 Subject: [PATCH 403/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fd277fb..d0e370f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ busybox 1.36.1-r5 apk busybox-binsh 1.36.1-r5 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk -cjson 1.7.15-r4 apk +cjson 1.7.17-r0 apk coreutils 9.3-r1 apk curl 8.5.0-r0 apk dbus-libs 1.14.8-r0 apk @@ -50,7 +50,7 @@ libbluray 1.3.4-r0 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r3 apk +libcrypto3 3.1.4-r4 apk libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libdrm 2.4.115-r4 apk @@ -83,7 +83,7 @@ libsndfile 1.2.0-r2 apk libsodium 1.0.18-r3 apk libsrt 1.5.2-r0 apk libssh 0.10.5-r0 apk -libssl3 3.1.4-r3 apk +libssl3 3.1.4-r4 apk libstdc++ 12.2.1_git20220924-r10 apk libtasn1 4.19.0-r1 apk libtheora 1.1.1-r17 apk From 205ae53f1d5fa0515ea6e92c9a2ad7cd4a0713f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jan 2024 21:23:42 +0000 Subject: [PATCH 404/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d0e370f..4f023f4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ gdbm 1.23-r1 apk glib 2.76.4-r0 apk glslang-libs 1.3.243.0-r1 apk gmp 6.2.1-r3 apk -gnutls 3.8.0-r2 apk +gnutls 3.8.3-r0 apk graphite2 1.3.14-r5 apk harfbuzz 7.3.0-r0 apk hwdata-pci 0.370-r0 apk @@ -142,7 +142,7 @@ skalibs 2.13.1.1-r1 apk soxr 0.1.3-r5 apk speexdsp 1.2.1-r1 apk spirv-tools 1.3.243.0-r1 apk -sqlite-libs 3.41.2-r2 apk +sqlite-libs 3.41.2-r3 apk ssl_client 1.36.1-r5 apk svt-av1-libs 1.6.0-r0 apk tdb-libs 1.4.8-r1 apk From 9b003a915352ea78aa4a8280049287bc8710c5a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 Jan 2024 02:28:13 +0000 Subject: [PATCH 405/525] Bot Updating Templated Files --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 04e701f..5506b53 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,6 @@ services: - TZ=Etc/UTC volumes: - /path/to/bazarr/config:/config - - /path/to/movies:/movies - - /path/to/tv:/tv ports: - 6767:6767 restart: unless-stopped @@ -97,8 +95,6 @@ docker run -d \ -e TZ=Etc/UTC \ -p 6767:6767 \ -v /path/to/bazarr/config:/config \ - -v /path/to/movies:/movies \ - -v /path/to/tv:/tv \ --restart unless-stopped \ lscr.io/linuxserver/bazarr:development ``` @@ -118,9 +114,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-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` | Bazarr data | -| `-v /movies` | Location of your movies | -| `-v /tv` | Location of your TV Shows | +| `-v /config` | Persistent config files | ## Environment variables from files (Docker secrets) @@ -283,6 +277,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.12.23:** - Rebase to Alpine 3.19. * **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. * **11.07.23:** - Rebase to Alpine 3.18 From 01025e4e3a80e0c131de9e41f6c4f2430dce19a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 Jan 2024 02:31:40 +0000 Subject: [PATCH 406/525] Bot Updating Package Versions --- package_versions.txt | 427 ++++++++++++++++++++++++++----------------- 1 file changed, 264 insertions(+), 163 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4f023f4..643e9c2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,163 +1,264 @@ -NAME VERSION TYPE -Simple Launcher 1.1.0.14 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.5-r0 apk -alsa-lib 1.2.9-r1 apk -aom-libs 3.6.1-r0 apk -apk-tools 2.14.0-r2 apk -bash 5.2.15-r5 apk -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r5 apk -busybox-binsh 1.36.1-r5 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cjson 1.7.17-r0 apk -coreutils 9.3-r1 apk -curl 8.5.0-r0 apk -dbus-libs 1.14.8-r0 apk -ffmpeg 6.0.1-r0 apk -ffmpeg-libavcodec 6.0.1-r0 apk -ffmpeg-libavdevice 6.0.1-r0 apk -ffmpeg-libavfilter 6.0.1-r0 apk -ffmpeg-libavformat 6.0.1-r0 apk -ffmpeg-libavutil 6.0.1-r0 apk -ffmpeg-libpostproc 6.0.1-r0 apk -ffmpeg-libswresample 6.0.1-r0 apk -ffmpeg-libswscale 6.0.1-r0 apk -flac-libs 1.4.3-r0 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fribidi 1.0.13-r0 apk -gdbm 1.23-r1 apk -glib 2.76.4-r0 apk -glslang-libs 1.3.243.0-r1 apk -gmp 6.2.1-r3 apk -gnutls 3.8.3-r0 apk -graphite2 1.3.14-r5 apk -harfbuzz 7.3.0-r0 apk -hwdata-pci 0.370-r0 apk -jq 1.6-r4 apk -lame-libs 3.100-r5 apk -lcms2 2.15-r2 apk -libacl 2.3.1-r3 apk -libass 0.17.1-r0 apk -libasyncns 0.8-r1 apk -libattr 2.5.1-r4 apk -libblkid 2.38.1-r8 apk -libbluray 1.3.4-r0 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r4 apk -libcurl 8.5.0-r0 apk -libdav1d 1.2.1-r0 apk -libdrm 2.4.115-r4 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libgcrypt 1.10.2-r1 apk -libgomp 12.2.1_git20220924-r10 apk -libgpg-error 1.47-r1 apk -libhwy 1.0.4-r1 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r2 apk -libmd 1.0.4-r2 apk -libmediainfo 23.07-r0 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libogg 1.3.5-r4 apk -libopenmpt 0.7.2-r0 apk -libpanelw 6.4_p20230506-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 5.264.1-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r10 apk -librist 0.2.7-r0 apk -libsndfile 1.2.0-r2 apk -libsodium 1.0.18-r3 apk -libsrt 1.5.2-r0 apk -libssh 0.10.5-r0 apk -libssl3 3.1.4-r4 apk -libstdc++ 12.2.1_git20220924-r10 apk -libtasn1 4.19.0-r1 apk -libtheora 1.1.1-r17 apk -libunibreak 5.1-r0 apk -libunistring 1.1-r1 apk -libva 2.18.0-r1 apk -libvdpau 1.5-r1 apk -libvorbis 1.3.7-r1 apk -libvpx 1.13.0-r2 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxfixes 6.0.1-r2 apk -libxml2 2.11.6-r0 apk -libxslt 1.1.38-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.4-r4 apk -linux-pam 1.5.2-r10 apk -lxml 4.9.4 python -mbedtls 2.28.5-r0 apk -mediainfo 23.07-r0 apk -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.31.3-r1 apk -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -netcat-openbsd 1.219-r1 apk -nettle 3.8.1-r2 apk -nghttp2-libs 1.57.0-r0 apk -numactl 2.0.16-r4 apk -numpy 1.26.3 python -onevpl-libs 2023.2.1-r0 apk -oniguruma 6.9.8-r1 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -p11-kit 0.24.1-r2 apk -pcre2 10.42-r1 apk -pillow 10.2.0 python -pip 23.3.2 python -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 0.1-r0 apk -python3 3.11.6-r0 apk -python3-pyc 3.11.6-r0 apk -python3-pycache-pyc0 3.11.6-r0 apk -readline 8.2.1-r1 apk -scanelf 1.3.7-r1 apk -sdl2 2.26.5-r0 apk -setuptools 69.0.3 python -shaderc 2023.3-r1 apk -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -soxr 0.1.3-r5 apk -speexdsp 1.2.1-r1 apk -spirv-tools 1.3.243.0-r1 apk -sqlite-libs 3.41.2-r3 apk -ssl_client 1.36.1-r5 apk -svt-av1-libs 1.6.0-r0 apk -tdb-libs 1.4.8-r1 apk -tinyxml2 9.0.0-r2 apk -tzdata 2023d-r0 apk -utmps-libs 0.1.2.1-r1 apk -v4l-utils-libs 1.24.1-r0 apk -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.243.0-r1 apk -wayland-libs-client 1.22.0-r2 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.42.0 python -x264-libs 0.164_git20220602-r1 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r1 apk -xz-libs 5.4.3-r0 apk -zimg 3.0.5-r0 apk -zlib 1.2.13-r1 apk +NAME VERSION TYPE +Simple Launcher 1.1.0.14 dotnet +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk +alpine-keys 2.4-r1 apk +alpine-release 3.19.0-r0 apk +alsa-lib 1.2.10-r0 apk +anyhow 1.0.71 rust-crate +anyhow 1.0.75 rust-crate +aom-libs 3.7.1-r0 apk +apk-tools 2.14.0-r5 apk +arg_enum_proc_macro 0.3.2 rust-crate +arrayvec 0.7.2 rust-crate +av-metrics 0.9.0 rust-crate +av1-grain 0.2.2 rust-crate +bash 5.2.21-r0 apk +bitflags 1.3.2 rust-crate +bitstream-io 1.6.0 rust-crate +bitstream-io 1.7.0 rust-crate +bitvec 1.0.1 rust-crate +bitvec_helpers 3.1.2 rust-crate +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +c-ares 1.24.0-r0 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cfg-if 1.0.0 rust-crate +cjson 1.7.17-r0 apk +clap 4.0.32 rust-crate +clap_complete 4.0.7 rust-crate +clap_derive 4.0.21 rust-crate +clap_lex 0.3.0 rust-crate +console 0.15.5 rust-crate +coreutils 9.4-r1 apk +coreutils-env 9.4-r1 apk +coreutils-fmt 9.4-r1 apk +coreutils-sha512sum 9.4-r1 apk +crc 3.0.1 rust-crate +crc-catalog 2.2.0 rust-crate +crossbeam 0.8.2 rust-crate +crossbeam-channel 0.5.8 rust-crate +crossbeam-deque 0.8.3 rust-crate +crossbeam-epoch 0.9.14 rust-crate +crossbeam-queue 0.3.8 rust-crate +crossbeam-utils 0.8.15 rust-crate +curl 8.5.0-r0 apk +dbus-libs 1.14.10-r0 apk +dolby_vision 3.2.0 rust-crate +either 1.8.1 rust-crate +fern 0.6.2 rust-crate +ffmpeg 6.1.1-r0 apk +ffmpeg-libavcodec 6.1.1-r0 apk +ffmpeg-libavdevice 6.1.1-r0 apk +ffmpeg-libavfilter 6.1.1-r0 apk +ffmpeg-libavformat 6.1.1-r0 apk +ffmpeg-libavutil 6.1.1-r0 apk +ffmpeg-libpostproc 6.1.1-r0 apk +ffmpeg-libswresample 6.1.1-r0 apk +ffmpeg-libswscale 6.1.1-r0 apk +fontconfig 2.14.2-r4 apk +freetype 2.13.2-r0 apk +fribidi 1.0.13-r0 apk +funty 2.0.0 rust-crate +gdbm 1.23-r1 apk +getrandom 0.2.9 rust-crate +glib 2.78.4-r0 apk +glslang-libs 1.3.261.1-r0 apk +graphite2 1.3.14-r6 apk +harfbuzz 8.3.0-r0 apk +heck 0.4.1 rust-crate +hwdata-pci 0.377.2-r0 apk +interpolate_name 0.2.3 rust-crate +io-lifetimes 1.0.10 rust-crate +is-terminal 0.4.7 rust-crate +itertools 0.10.5 rust-crate +ivf 0.1.2 rust-crate +jq 1.7.1-r0 apk +lab 0.11.0 rust-crate +lame-libs 3.100-r5 apk +lazy_static 1.4.0 rust-crate +lcms2 2.15-r4 apk +libSvtAv1Enc 1.7.0-r0 apk +libacl 2.3.1-r4 apk +libass 0.17.1-r1 apk +libasyncns 0.8-r2 apk +libattr 2.5.1-r5 apk +libblkid 2.39.3-r0 apk +libbluray 1.3.4-r1 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk +libc 0.2.144 rust-crate +libc 0.2.149 rust-crate +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r4 apk +libcurl 8.5.0-r0 apk +libdav1d 1.3.0-r0 apk +libdovi 3.2.0-r1 apk +libdrm 2.4.118-r0 apk +libexpat 2.5.0-r2 apk +libffi 3.4.4-r3 apk +libflac 1.4.3-r1 apk +libgcc 13.2.1_git20231014-r0 apk +libgcrypt 1.10.3-r0 apk +libgomp 13.2.1_git20231014-r0 apk +libgpg-error 1.47-r2 apk +libhwy 1.0.7-r0 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 23.11-r0 apk +libmount 2.39.3-r0 apk +libncursesw 6.4_p20231125-r0 apk +libogg 1.3.5-r5 apk +libopenmpt 0.7.3-r1 apk +libpanelw 6.4_p20231125-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 6.338.1-r0 apk +libpng 1.6.40-r0 apk +libproc2 4.0.4-r0 apk +libpulse 16.1-r11 apk +librist 0.2.10-r0 apk +libsharpyuv 1.3.2-r0 apk +libsndfile 1.2.2-r0 apk +libsodium 1.0.19-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.10.6-r0 apk +libssl3 3.1.4-r4 apk +libstdc++ 13.2.1_git20231014-r0 apk +libtheora 1.1.1-r18 apk +libunibreak 5.1-r3 apk +libunistring 1.1-r2 apk +libva 2.20.0-r0 apk +libvdpau 1.5-r2 apk +libvorbis 1.3.7-r2 apk +libvpx 1.13.1-r0 apk +libwebp 1.3.2-r0 apk +libwebpmux 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk +libxfixes 6.0.1-r3 apk +libxml2 2.11.6-r0 apk +libxslt 1.1.39-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.5-r2 apk +lilv-libs 0.24.22-r0 apk +linux-pam 1.5.3-r7 apk +linux-raw-sys 0.3.7 rust-crate +log 0.4.17 rust-crate +lxml 4.9.4 python +maybe-rayon 0.1.1 rust-crate +mbedtls 2.28.6-r0 apk +mediainfo 23.11-r0 apk +memchr 2.5.0 rust-crate +memoffset 0.8.0 rust-crate +minimal-lexical 0.2.1 rust-crate +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.32.3-r0 apk +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk +netcat-openbsd 1.226-r0 apk +new_debug_unreachable 1.0.4 rust-crate +nghttp2-libs 1.58.0-r0 apk +nom 7.1.3 rust-crate +noop_proc_macro 0.3.0 rust-crate +num-bigint 0.4.3 rust-crate +num-derive 0.3.3 rust-crate +num-integer 0.1.45 rust-crate +num-rational 0.4.1 rust-crate +num-traits 0.2.15 rust-crate +num_cpus 1.15.0 rust-crate +numactl 2.0.16-r4 apk +numpy 1.26.3 python +once_cell 1.17.1 rust-crate +onevpl-libs 2023.3.1-r2 apk +oniguruma 6.9.9-r0 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +os_str_bytes 6.5.0 rust-crate +paste 1.0.12 rust-crate +pcre2 10.42-r2 apk +pillow 10.2.0 python +pip 23.3.2 python +ppv-lite86 0.2.17 rust-crate +proc-macro-error 1.0.4 rust-crate +proc-macro-error-attr 1.0.4 rust-crate +proc-macro2 1.0.57 rust-crate +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 3.11.6-r1 apk +python3 3.11.6-r1 apk +python3-pyc 3.11.6-r1 apk +python3-pycache-pyc0 3.11.6-r1 apk +quote 1.0.27 rust-crate +radium 0.7.0 rust-crate +rand 0.8.5 rust-crate +rand_chacha 0.3.1 rust-crate +rand_core 0.6.4 rust-crate +rav1e 0.6.6 rust-crate +rav1e-libs 0.6.6-r2 apk +rayon 1.7.0 rust-crate +rayon-core 1.11.0 rust-crate +readline 8.2.1-r2 apk +rust_hawktracer 0.7.0 rust-crate +rust_hawktracer_normal_macro 0.4.1 rust-crate +rust_hawktracer_proc_macro 0.4.1 rust-crate +rustix 0.37.19 rust-crate +scan_fmt 0.2.6 rust-crate +scanelf 1.3.7-r2 apk +scopeguard 1.1.0 rust-crate +sdl2 2.28.5-r0 apk +serd-libs 0.32.0-r0 apk +serde 1.0.163 rust-crate +serde_derive 1.0.163 rust-crate +setuptools 69.0.3 python +shaderc 2023.7-r0 apk +shadow 4.14.2-r0 apk +signal-hook 0.3.15 rust-crate +signal-hook-registry 1.4.1 rust-crate +simd_helpers 0.1.0 rust-crate +skalibs 2.14.0.1-r0 apk +sord-libs 0.16.16-r0 apk +soxr 0.1.3-r7 apk +speexdsp 1.2.1-r2 apk +spirv-tools 1.3.261.1-r0 apk +sqlite-libs 3.44.2-r0 apk +sratom 0.6.16-r0 apk +ssl_client 1.36.1-r15 apk +syn 1.0.109 rust-crate +syn 2.0.16 rust-crate +tap 1.0.1 rust-crate +tdb-libs 1.4.9-r0 apk +termcolor 1.2.0 rust-crate +terminal_size 0.2.6 rust-crate +thiserror 1.0.40 rust-crate +thiserror-impl 1.0.40 rust-crate +tinyxml2 9.0.0-r2 apk +tzdata 2023d-r0 apk +unicode-ident 1.0.8 rust-crate +unicode-width 0.1.10 rust-crate +utmps-libs 0.1.2.2-r0 apk +v4l-utils-libs 1.24.1-r1 apk +v_frame 0.3.3 rust-crate +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.261.1-r0 apk +wayland-libs-client 1.22.0-r4 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.42.0 python +wyz 0.5.1 rust-crate +x264-libs 0.164_git20231001-r0 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r2 apk +xz-libs 5.4.5-r0 apk +y4m 0.8.0 rust-crate +zimg 3.0.5-r2 apk +zix-libs 0.4.2-r0 apk +zlib 1.3.1-r0 apk From 09fb76f5fac6190eeb74c525a6558352611f0e0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 27 Jan 2024 06:28:52 +0000 Subject: [PATCH 407/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 643e9c2..8aee7ff 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -92,7 +92,7 @@ libbz2 1.0.8-r6 apk libc 0.2.144 rust-crate libc 0.2.149 rust-crate libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r4 apk +libcrypto3 3.1.4-r5 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libdovi 3.2.0-r1 apk @@ -128,7 +128,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.1.4-r4 apk +libssl3 3.1.4-r5 apk libstdc++ 13.2.1_git20231014-r0 apk libtheora 1.1.1-r18 apk libunibreak 5.1-r3 apk From 083096ba0e027e61adceafe079d7b0a2128caa0c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Jan 2024 06:31:17 +0000 Subject: [PATCH 408/525] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8aee7ff..81dcd56 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Simple Launcher 1.1.0.14 dotnet alpine-baselayout 3.4.3-r2 apk alpine-baselayout-data 3.4.3-r2 apk alpine-keys 2.4-r1 apk -alpine-release 3.19.0-r0 apk +alpine-release 3.19.1-r0 apk alsa-lib 1.2.10-r0 apk anyhow 1.0.71 rust-crate anyhow 1.0.75 rust-crate @@ -22,7 +22,7 @@ bitvec_helpers 3.1.2 rust-crate brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r0 apk +c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk cfg-if 1.0.0 rust-crate @@ -32,10 +32,10 @@ clap_complete 4.0.7 rust-crate clap_derive 4.0.21 rust-crate clap_lex 0.3.0 rust-crate console 0.15.5 rust-crate -coreutils 9.4-r1 apk -coreutils-env 9.4-r1 apk -coreutils-fmt 9.4-r1 apk -coreutils-sha512sum 9.4-r1 apk +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk crc 3.0.1 rust-crate crc-catalog 2.2.0 rust-crate crossbeam 0.8.2 rust-crate @@ -155,7 +155,7 @@ linux-raw-sys 0.3.7 rust-crate log 0.4.17 rust-crate lxml 4.9.4 python maybe-rayon 0.1.1 rust-crate -mbedtls 2.28.6-r0 apk +mbedtls 2.28.7-r0 apk mediainfo 23.11-r0 apk memchr 2.5.0 rust-crate memoffset 0.8.0 rust-crate From 1a62d5a8bdac1c2cb21d819ed2f50eeeb4388f70 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 4 Feb 2024 01:37:32 +0000 Subject: [PATCH 409/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 81dcd56..580d03b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -187,7 +187,7 @@ os_str_bytes 6.5.0 rust-crate paste 1.0.12 rust-crate pcre2 10.42-r2 apk pillow 10.2.0 python -pip 23.3.2 python +pip 24.0 python ppv-lite86 0.2.17 rust-crate proc-macro-error 1.0.4 rust-crate proc-macro-error-attr 1.0.4 rust-crate @@ -242,7 +242,7 @@ terminal_size 0.2.6 rust-crate thiserror 1.0.40 rust-crate thiserror-impl 1.0.40 rust-crate tinyxml2 9.0.0-r2 apk -tzdata 2023d-r0 apk +tzdata 2024a-r0 apk unicode-ident 1.0.8 rust-crate unicode-width 0.1.10 rust-crate utmps-libs 0.1.2.2-r0 apk From c3bd5e0acea905292f131ac677345ea72b93c572 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Feb 2024 21:20:00 +0000 Subject: [PATCH 410/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 580d03b..460ad7c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -177,7 +177,7 @@ num-rational 0.4.1 rust-crate num-traits 0.2.15 rust-crate num_cpus 1.15.0 rust-crate numactl 2.0.16-r4 apk -numpy 1.26.3 python +numpy 1.26.4 python once_cell 1.17.1 rust-crate onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk From bde7fb0a295d7acbf50a6bf1e7572a4a0c0e90df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 10 Feb 2024 06:30:47 +0000 Subject: [PATCH 411/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 460ad7c..95c157c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -97,7 +97,7 @@ libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libdovi 3.2.0-r1 apk libdrm 2.4.118-r0 apk -libexpat 2.5.0-r2 apk +libexpat 2.6.0-r0 apk libffi 3.4.4-r3 apk libflac 1.4.3-r1 apk libgcc 13.2.1_git20231014-r0 apk From 8c6f2227f18d99c1f336f496a182dc32d648fdd9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Feb 2024 04:30:14 +0000 Subject: [PATCH 412/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 95c157c..3458aff 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -219,7 +219,7 @@ sdl2 2.28.5-r0 apk serd-libs 0.32.0-r0 apk serde 1.0.163 rust-crate serde_derive 1.0.163 rust-crate -setuptools 69.0.3 python +setuptools 69.1.0 python shaderc 2023.7-r0 apk shadow 4.14.2-r0 apk signal-hook 0.3.15 rust-crate From 65cb257d17bcac09a737e4fa5f979b5361b8a625 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Feb 2024 21:19:58 +0000 Subject: [PATCH 413/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3458aff..8fdbb94 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -145,7 +145,7 @@ libxcb 1.16-r0 apk libxdmcp 1.1.4-r3 apk libxext 1.3.5-r3 apk libxfixes 6.0.1-r3 apk -libxml2 2.11.6-r0 apk +libxml2 2.11.7-r0 apk libxslt 1.1.39-r0 apk libzen 0.4.41-r0 apk libzmq 4.3.5-r2 apk From 7247f3ccadd1a62587946cf26409216511f2a7b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Feb 2024 01:23:42 +0000 Subject: [PATCH 414/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8fdbb94..607d906 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -194,10 +194,10 @@ proc-macro-error-attr 1.0.4 rust-crate proc-macro2 1.0.57 rust-crate procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python -pyc 3.11.6-r1 apk -python3 3.11.6-r1 apk -python3-pyc 3.11.6-r1 apk -python3-pycache-pyc0 3.11.6-r1 apk +pyc 3.11.8-r0 apk +python3 3.11.8-r0 apk +python3-pyc 3.11.8-r0 apk +python3-pycache-pyc0 3.11.8-r0 apk quote 1.0.27 rust-crate radium 0.7.0 rust-crate rand 0.8.5 rust-crate From 50376f6a1a993c719d94efcaefaa0d000458dc63 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 24 Feb 2024 06:28:22 +0000 Subject: [PATCH 415/525] Bot Updating Templated Files --- Jenkinsfile | 297 +++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 154 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9ff330e..6814639 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,9 +255,11 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ - apk add --no-cache py3-pip && \ - pip install s3cmd && \ + ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache python3 && \ + python3 -m venv /lsiopy && \ + pip install --no-cache-dir -U pip && \ + pip install --no-cache-dir s3cmd && \ s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } @@ -272,150 +274,149 @@ pipeline { } } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + 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 Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" 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 Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f development - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - 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 readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + 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 readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' - fi - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} - fi - # Stage 4 - Sync Readme to Docker Hub - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then - echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" - else - echo "Syncing readme to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" - fi - DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') - curl -s \ - -H "Authorization: JWT ${DH_TOKEN}" \ - -H "Content-Type: application/json" \ - -X PATCH \ - -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ - https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else - echo "Not the default Github branch. Skipping readme sync to Docker Hub." + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + else + echo "Not the default Github branch. Skipping readme sync to Docker Hub." + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() } } } @@ -713,12 +714,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -729,7 +724,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin @@ -760,12 +755,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -776,7 +765,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin From 0a1bd429c252bdf817fe4e133a6324a99ffb92ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 24 Feb 2024 06:32:06 +0000 Subject: [PATCH 416/525] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 4 ++-- .github/workflows/external_trigger.yml | 2 +- .github/workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .github/workflows/package_trigger_scheduler.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index ce3d19a..f1b5f1c 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -67,10 +67,10 @@ body: - type: textarea attributes: description: | - Provide a full docker log, output of "docker logs linuxserver.io" + Provide a full docker log, output of "docker logs bazarr" label: Container logs placeholder: | - Output of `docker logs linuxserver.io` + Output of `docker logs bazarr` render: bash validations: required: true diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index fc41f68..714171a 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-development: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: External Trigger if: github.ref == 'refs/heads/development' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index bbfe4c3..f91a373 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 6dcf56a..91a9912 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-development: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: Package Trigger if: github.ref == 'refs/heads/development' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 1939e1e..127e446 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' From eae2be9b2d3c62c69da5d1a5c35fa642316dd3eb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 24 Feb 2024 06:35:28 +0000 Subject: [PATCH 417/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 607d906..e509346 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -219,7 +219,7 @@ sdl2 2.28.5-r0 apk serd-libs 0.32.0-r0 apk serde 1.0.163 rust-crate serde_derive 1.0.163 rust-crate -setuptools 69.1.0 python +setuptools 69.1.1 python shaderc 2023.7-r0 apk shadow 4.14.2-r0 apk signal-hook 0.3.15 rust-crate From c6b84fdeaa03af82d158a52c32c13d0e87fda653 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Feb 2024 21:26:56 +0000 Subject: [PATCH 418/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e509346..189a23f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -94,7 +94,7 @@ libc 0.2.149 rust-crate libc-utils 0.7.2-r5 apk libcrypto3 3.1.4-r5 apk libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r0 apk +libdav1d 1.3.0-r1 apk libdovi 3.2.0-r1 apk libdrm 2.4.118-r0 apk libexpat 2.6.0-r0 apk From 8fadbb1d0584c477635a18aa71825f3c093445af Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 2 Mar 2024 06:31:03 +0000 Subject: [PATCH 419/525] Bot Updating Package Versions --- package_versions.txt | 528 +++++++++++++++++++++---------------------- 1 file changed, 264 insertions(+), 264 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 189a23f..aa287fd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,264 +1,264 @@ -NAME VERSION TYPE -Simple Launcher 1.1.0.14 dotnet -alpine-baselayout 3.4.3-r2 apk -alpine-baselayout-data 3.4.3-r2 apk -alpine-keys 2.4-r1 apk -alpine-release 3.19.1-r0 apk -alsa-lib 1.2.10-r0 apk -anyhow 1.0.71 rust-crate -anyhow 1.0.75 rust-crate -aom-libs 3.7.1-r0 apk -apk-tools 2.14.0-r5 apk -arg_enum_proc_macro 0.3.2 rust-crate -arrayvec 0.7.2 rust-crate -av-metrics 0.9.0 rust-crate -av1-grain 0.2.2 rust-crate -bash 5.2.21-r0 apk -bitflags 1.3.2 rust-crate -bitstream-io 1.6.0 rust-crate -bitstream-io 1.7.0 rust-crate -bitvec 1.0.1 rust-crate -bitvec_helpers 3.1.2 rust-crate -brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r15 apk -busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cfg-if 1.0.0 rust-crate -cjson 1.7.17-r0 apk -clap 4.0.32 rust-crate -clap_complete 4.0.7 rust-crate -clap_derive 4.0.21 rust-crate -clap_lex 0.3.0 rust-crate -console 0.15.5 rust-crate -coreutils 9.4-r2 apk -coreutils-env 9.4-r2 apk -coreutils-fmt 9.4-r2 apk -coreutils-sha512sum 9.4-r2 apk -crc 3.0.1 rust-crate -crc-catalog 2.2.0 rust-crate -crossbeam 0.8.2 rust-crate -crossbeam-channel 0.5.8 rust-crate -crossbeam-deque 0.8.3 rust-crate -crossbeam-epoch 0.9.14 rust-crate -crossbeam-queue 0.3.8 rust-crate -crossbeam-utils 0.8.15 rust-crate -curl 8.5.0-r0 apk -dbus-libs 1.14.10-r0 apk -dolby_vision 3.2.0 rust-crate -either 1.8.1 rust-crate -fern 0.6.2 rust-crate -ffmpeg 6.1.1-r0 apk -ffmpeg-libavcodec 6.1.1-r0 apk -ffmpeg-libavdevice 6.1.1-r0 apk -ffmpeg-libavfilter 6.1.1-r0 apk -ffmpeg-libavformat 6.1.1-r0 apk -ffmpeg-libavutil 6.1.1-r0 apk -ffmpeg-libpostproc 6.1.1-r0 apk -ffmpeg-libswresample 6.1.1-r0 apk -ffmpeg-libswscale 6.1.1-r0 apk -fontconfig 2.14.2-r4 apk -freetype 2.13.2-r0 apk -fribidi 1.0.13-r0 apk -funty 2.0.0 rust-crate -gdbm 1.23-r1 apk -getrandom 0.2.9 rust-crate -glib 2.78.4-r0 apk -glslang-libs 1.3.261.1-r0 apk -graphite2 1.3.14-r6 apk -harfbuzz 8.3.0-r0 apk -heck 0.4.1 rust-crate -hwdata-pci 0.377.2-r0 apk -interpolate_name 0.2.3 rust-crate -io-lifetimes 1.0.10 rust-crate -is-terminal 0.4.7 rust-crate -itertools 0.10.5 rust-crate -ivf 0.1.2 rust-crate -jq 1.7.1-r0 apk -lab 0.11.0 rust-crate -lame-libs 3.100-r5 apk -lazy_static 1.4.0 rust-crate -lcms2 2.15-r4 apk -libSvtAv1Enc 1.7.0-r0 apk -libacl 2.3.1-r4 apk -libass 0.17.1-r1 apk -libasyncns 0.8-r2 apk -libattr 2.5.1-r5 apk -libblkid 2.39.3-r0 apk -libbluray 1.3.4-r1 apk -libbsd 0.11.7-r3 apk -libbz2 1.0.8-r6 apk -libc 0.2.144 rust-crate -libc 0.2.149 rust-crate -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r5 apk -libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r1 apk -libdovi 3.2.0-r1 apk -libdrm 2.4.118-r0 apk -libexpat 2.6.0-r0 apk -libffi 3.4.4-r3 apk -libflac 1.4.3-r1 apk -libgcc 13.2.1_git20231014-r0 apk -libgcrypt 1.10.3-r0 apk -libgomp 13.2.1_git20231014-r0 apk -libgpg-error 1.47-r2 apk -libhwy 1.0.7-r0 apk -libidn2 2.3.4-r4 apk -libintl 0.22.3-r0 apk -libjpeg-turbo 3.0.1-r0 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r3 apk -libmd 1.1.0-r0 apk -libmediainfo 23.11-r0 apk -libmount 2.39.3-r0 apk -libncursesw 6.4_p20231125-r0 apk -libogg 1.3.5-r5 apk -libopenmpt 0.7.3-r1 apk -libpanelw 6.4_p20231125-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 6.338.1-r0 apk -libpng 1.6.40-r0 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r11 apk -librist 0.2.10-r0 apk -libsharpyuv 1.3.2-r0 apk -libsndfile 1.2.2-r0 apk -libsodium 1.0.19-r0 apk -libsrt 1.5.3-r0 apk -libssh 0.10.6-r0 apk -libssl3 3.1.4-r5 apk -libstdc++ 13.2.1_git20231014-r0 apk -libtheora 1.1.1-r18 apk -libunibreak 5.1-r3 apk -libunistring 1.1-r2 apk -libva 2.20.0-r0 apk -libvdpau 1.5-r2 apk -libvorbis 1.3.7-r2 apk -libvpx 1.13.1-r0 apk -libwebp 1.3.2-r0 apk -libwebpmux 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r3 apk -libxcb 1.16-r0 apk -libxdmcp 1.1.4-r3 apk -libxext 1.3.5-r3 apk -libxfixes 6.0.1-r3 apk -libxml2 2.11.7-r0 apk -libxslt 1.1.39-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.5-r2 apk -lilv-libs 0.24.22-r0 apk -linux-pam 1.5.3-r7 apk -linux-raw-sys 0.3.7 rust-crate -log 0.4.17 rust-crate -lxml 4.9.4 python -maybe-rayon 0.1.1 rust-crate -mbedtls 2.28.7-r0 apk -mediainfo 23.11-r0 apk -memchr 2.5.0 rust-crate -memoffset 0.8.0 rust-crate -minimal-lexical 0.2.1 rust-crate -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.32.3-r0 apk -musl 1.2.4_git20230717-r4 apk -musl-utils 1.2.4_git20230717-r4 apk -ncurses-terminfo-base 6.4_p20231125-r0 apk -netcat-openbsd 1.226-r0 apk -new_debug_unreachable 1.0.4 rust-crate -nghttp2-libs 1.58.0-r0 apk -nom 7.1.3 rust-crate -noop_proc_macro 0.3.0 rust-crate -num-bigint 0.4.3 rust-crate -num-derive 0.3.3 rust-crate -num-integer 0.1.45 rust-crate -num-rational 0.4.1 rust-crate -num-traits 0.2.15 rust-crate -num_cpus 1.15.0 rust-crate -numactl 2.0.16-r4 apk -numpy 1.26.4 python -once_cell 1.17.1 rust-crate -onevpl-libs 2023.3.1-r2 apk -oniguruma 6.9.9-r0 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -os_str_bytes 6.5.0 rust-crate -paste 1.0.12 rust-crate -pcre2 10.42-r2 apk -pillow 10.2.0 python -pip 24.0 python -ppv-lite86 0.2.17 rust-crate -proc-macro-error 1.0.4 rust-crate -proc-macro-error-attr 1.0.4 rust-crate -proc-macro2 1.0.57 rust-crate -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 3.11.8-r0 apk -python3 3.11.8-r0 apk -python3-pyc 3.11.8-r0 apk -python3-pycache-pyc0 3.11.8-r0 apk -quote 1.0.27 rust-crate -radium 0.7.0 rust-crate -rand 0.8.5 rust-crate -rand_chacha 0.3.1 rust-crate -rand_core 0.6.4 rust-crate -rav1e 0.6.6 rust-crate -rav1e-libs 0.6.6-r2 apk -rayon 1.7.0 rust-crate -rayon-core 1.11.0 rust-crate -readline 8.2.1-r2 apk -rust_hawktracer 0.7.0 rust-crate -rust_hawktracer_normal_macro 0.4.1 rust-crate -rust_hawktracer_proc_macro 0.4.1 rust-crate -rustix 0.37.19 rust-crate -scan_fmt 0.2.6 rust-crate -scanelf 1.3.7-r2 apk -scopeguard 1.1.0 rust-crate -sdl2 2.28.5-r0 apk -serd-libs 0.32.0-r0 apk -serde 1.0.163 rust-crate -serde_derive 1.0.163 rust-crate -setuptools 69.1.1 python -shaderc 2023.7-r0 apk -shadow 4.14.2-r0 apk -signal-hook 0.3.15 rust-crate -signal-hook-registry 1.4.1 rust-crate -simd_helpers 0.1.0 rust-crate -skalibs 2.14.0.1-r0 apk -sord-libs 0.16.16-r0 apk -soxr 0.1.3-r7 apk -speexdsp 1.2.1-r2 apk -spirv-tools 1.3.261.1-r0 apk -sqlite-libs 3.44.2-r0 apk -sratom 0.6.16-r0 apk -ssl_client 1.36.1-r15 apk -syn 1.0.109 rust-crate -syn 2.0.16 rust-crate -tap 1.0.1 rust-crate -tdb-libs 1.4.9-r0 apk -termcolor 1.2.0 rust-crate -terminal_size 0.2.6 rust-crate -thiserror 1.0.40 rust-crate -thiserror-impl 1.0.40 rust-crate -tinyxml2 9.0.0-r2 apk -tzdata 2024a-r0 apk -unicode-ident 1.0.8 rust-crate -unicode-width 0.1.10 rust-crate -utmps-libs 0.1.2.2-r0 apk -v4l-utils-libs 1.24.1-r1 apk -v_frame 0.3.3 rust-crate -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.261.1-r0 apk -wayland-libs-client 1.22.0-r4 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.42.0 python -wyz 0.5.1 rust-crate -x264-libs 0.164_git20231001-r0 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r2 apk -xz-libs 5.4.5-r0 apk -y4m 0.8.0 rust-crate -zimg 3.0.5-r2 apk -zix-libs 0.4.2-r0 apk -zlib 1.3.1-r0 apk +NAME VERSION TYPE +Simple Launcher 1.1.0.14 dotnet (+5 duplicates) +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk +alpine-keys 2.4-r1 apk +alpine-release 3.19.1-r0 apk +alsa-lib 1.2.10-r0 apk +anyhow 1.0.71 rust-crate +anyhow 1.0.75 rust-crate +aom-libs 3.7.1-r0 apk +apk-tools 2.14.0-r5 apk +arg_enum_proc_macro 0.3.2 rust-crate +arrayvec 0.7.2 rust-crate +av-metrics 0.9.0 rust-crate +av1-grain 0.2.2 rust-crate +bash 5.2.21-r0 apk +bitflags 1.3.2 rust-crate +bitstream-io 1.6.0 rust-crate +bitstream-io 1.7.0 rust-crate +bitvec 1.0.1 rust-crate +bitvec_helpers 3.1.2 rust-crate +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +c-ares 1.24.0-r1 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +cfg-if 1.0.0 rust-crate +cjson 1.7.17-r0 apk +clap 4.0.32 rust-crate +clap_complete 4.0.7 rust-crate +clap_derive 4.0.21 rust-crate +clap_lex 0.3.0 rust-crate +console 0.15.5 rust-crate +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk +crc 3.0.1 rust-crate +crc-catalog 2.2.0 rust-crate +crossbeam 0.8.2 rust-crate +crossbeam-channel 0.5.8 rust-crate +crossbeam-deque 0.8.3 rust-crate +crossbeam-epoch 0.9.14 rust-crate +crossbeam-queue 0.3.8 rust-crate +crossbeam-utils 0.8.15 rust-crate +curl 8.5.0-r0 apk +dbus-libs 1.14.10-r0 apk +dolby_vision 3.2.0 rust-crate +either 1.8.1 rust-crate +fern 0.6.2 rust-crate +ffmpeg 6.1.1-r0 apk +ffmpeg-libavcodec 6.1.1-r0 apk +ffmpeg-libavdevice 6.1.1-r0 apk +ffmpeg-libavfilter 6.1.1-r0 apk +ffmpeg-libavformat 6.1.1-r0 apk +ffmpeg-libavutil 6.1.1-r0 apk +ffmpeg-libpostproc 6.1.1-r0 apk +ffmpeg-libswresample 6.1.1-r0 apk +ffmpeg-libswscale 6.1.1-r0 apk +fontconfig 2.14.2-r4 apk +freetype 2.13.2-r0 apk +fribidi 1.0.13-r0 apk +funty 2.0.0 rust-crate +gdbm 1.23-r1 apk +getrandom 0.2.9 rust-crate +glib 2.78.4-r0 apk +glslang-libs 1.3.261.1-r0 apk +graphite2 1.3.14-r6 apk +harfbuzz 8.3.0-r0 apk +heck 0.4.1 rust-crate +hwdata-pci 0.377.2-r0 apk +interpolate_name 0.2.3 rust-crate +io-lifetimes 1.0.10 rust-crate +is-terminal 0.4.7 rust-crate +itertools 0.10.5 rust-crate +ivf 0.1.2 rust-crate +jq 1.7.1-r0 apk +lab 0.11.0 rust-crate +lame-libs 3.100-r5 apk +lazy_static 1.4.0 rust-crate +lcms2 2.15-r4 apk +libSvtAv1Enc 1.7.0-r0 apk +libacl 2.3.1-r4 apk +libass 0.17.1-r1 apk +libasyncns 0.8-r2 apk +libattr 2.5.1-r5 apk +libblkid 2.39.3-r0 apk +libbluray 1.3.4-r1 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk +libc 0.2.144 rust-crate +libc 0.2.149 rust-crate +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r5 apk +libcurl 8.5.0-r0 apk +libdav1d 1.3.0-r1 apk +libdovi 3.2.0-r1 apk +libdrm 2.4.118-r0 apk +libexpat 2.6.0-r0 apk +libffi 3.4.4-r3 apk +libflac 1.4.3-r1 apk +libgcc 13.2.1_git20231014-r0 apk +libgcrypt 1.10.3-r0 apk +libgomp 13.2.1_git20231014-r0 apk +libgpg-error 1.47-r2 apk +libhwy 1.0.7-r0 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 23.11-r0 apk +libmount 2.39.3-r0 apk +libncursesw 6.4_p20231125-r0 apk +libogg 1.3.5-r5 apk +libopenmpt 0.7.3-r1 apk +libpanelw 6.4_p20231125-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 6.338.1-r0 apk +libpng 1.6.40-r0 apk +libproc2 4.0.4-r0 apk +libpulse 16.1-r11 apk +librist 0.2.10-r0 apk +libsharpyuv 1.3.2-r0 apk +libsndfile 1.2.2-r0 apk +libsodium 1.0.19-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.10.6-r0 apk +libssl3 3.1.4-r5 apk +libstdc++ 13.2.1_git20231014-r0 apk +libtheora 1.1.1-r18 apk +libunibreak 5.1-r3 apk +libunistring 1.1-r2 apk +libva 2.20.0-r0 apk +libvdpau 1.5-r2 apk +libvorbis 1.3.7-r2 apk +libvpx 1.13.1-r0 apk +libwebp 1.3.2-r0 apk +libwebpmux 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk +libxfixes 6.0.1-r3 apk +libxml2 2.11.7-r0 apk +libxslt 1.1.39-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.5-r2 apk +lilv-libs 0.24.22-r0 apk +linux-pam 1.5.3-r7 apk +linux-raw-sys 0.3.7 rust-crate +log 0.4.17 rust-crate +lxml 4.9.4 python +maybe-rayon 0.1.1 rust-crate +mbedtls 2.28.7-r0 apk +mediainfo 23.11-r0 apk +memchr 2.5.0 rust-crate +memoffset 0.8.0 rust-crate +minimal-lexical 0.2.1 rust-crate +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.32.3-r0 apk +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk +netcat-openbsd 1.226-r0 apk +new_debug_unreachable 1.0.4 rust-crate +nghttp2-libs 1.58.0-r0 apk +nom 7.1.3 rust-crate +noop_proc_macro 0.3.0 rust-crate +num-bigint 0.4.3 rust-crate +num-derive 0.3.3 rust-crate +num-integer 0.1.45 rust-crate +num-rational 0.4.1 rust-crate +num-traits 0.2.15 rust-crate +num_cpus 1.15.0 rust-crate +numactl 2.0.16-r4 apk +numpy 1.26.4 python +once_cell 1.17.1 rust-crate +onevpl-libs 2023.3.1-r2 apk +oniguruma 6.9.9-r0 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +os_str_bytes 6.5.0 rust-crate +paste 1.0.12 rust-crate +pcre2 10.42-r2 apk +pillow 10.2.0 python +pip 24.0 python +ppv-lite86 0.2.17 rust-crate +proc-macro-error 1.0.4 rust-crate +proc-macro-error-attr 1.0.4 rust-crate +proc-macro2 1.0.57 rust-crate +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 3.11.8-r0 apk +python3 3.11.8-r0 apk +python3-pyc 3.11.8-r0 apk +python3-pycache-pyc0 3.11.8-r0 apk +quote 1.0.27 rust-crate +radium 0.7.0 rust-crate +rand 0.8.5 rust-crate +rand_chacha 0.3.1 rust-crate +rand_core 0.6.4 rust-crate +rav1e 0.6.6 rust-crate +rav1e-libs 0.6.6-r2 apk +rayon 1.7.0 rust-crate +rayon-core 1.11.0 rust-crate +readline 8.2.1-r2 apk +rust_hawktracer 0.7.0 rust-crate +rust_hawktracer_normal_macro 0.4.1 rust-crate +rust_hawktracer_proc_macro 0.4.1 rust-crate +rustix 0.37.19 rust-crate +scan_fmt 0.2.6 rust-crate +scanelf 1.3.7-r2 apk +scopeguard 1.1.0 rust-crate +sdl2 2.28.5-r0 apk +serd-libs 0.32.0-r0 apk +serde 1.0.163 rust-crate +serde_derive 1.0.163 rust-crate +setuptools 69.1.1 python +shaderc 2023.7-r0 apk +shadow 4.14.2-r0 apk +signal-hook 0.3.15 rust-crate +signal-hook-registry 1.4.1 rust-crate +simd_helpers 0.1.0 rust-crate +skalibs 2.14.0.1-r0 apk +sord-libs 0.16.16-r0 apk +soxr 0.1.3-r7 apk +speexdsp 1.2.1-r2 apk +spirv-tools 1.3.261.1-r0 apk +sqlite-libs 3.44.2-r0 apk +sratom 0.6.16-r0 apk +ssl_client 1.36.1-r15 apk +syn 1.0.109 rust-crate +syn 2.0.16 rust-crate +tap 1.0.1 rust-crate +tdb-libs 1.4.9-r0 apk +termcolor 1.2.0 rust-crate +terminal_size 0.2.6 rust-crate +thiserror 1.0.40 rust-crate +thiserror-impl 1.0.40 rust-crate +tinyxml2 9.0.0-r2 apk +tzdata 2024a-r0 apk +unicode-ident 1.0.8 rust-crate +unicode-width 0.1.10 rust-crate +utmps-libs 0.1.2.2-r0 apk +v4l-utils-libs 1.24.1-r1 apk +v_frame 0.3.3 rust-crate +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.261.1-r0 apk +wayland-libs-client 1.22.0-r4 apk +webrtcvad-wheels 2.0.11.post1 python +wheel 0.42.0 python +wyz 0.5.1 rust-crate +x264-libs 0.164_git20231001-r0 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r2 apk +xz-libs 5.4.5-r0 apk +y4m 0.8.0 rust-crate +zimg 3.0.5-r2 apk +zix-libs 0.4.2-r0 apk +zlib 1.3.1-r0 apk From fc43ce0fb77ba01a48d33cd1a9f9868cf70adacd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Mar 2024 07:20:05 +0000 Subject: [PATCH 420/525] Bot Updating Package Versions --- package_versions.txt | 637 +++++++++++++++++++++++++------------------ 1 file changed, 373 insertions(+), 264 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aa287fd..51b1567 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,264 +1,373 @@ -NAME VERSION TYPE -Simple Launcher 1.1.0.14 dotnet (+5 duplicates) -alpine-baselayout 3.4.3-r2 apk -alpine-baselayout-data 3.4.3-r2 apk -alpine-keys 2.4-r1 apk -alpine-release 3.19.1-r0 apk -alsa-lib 1.2.10-r0 apk -anyhow 1.0.71 rust-crate -anyhow 1.0.75 rust-crate -aom-libs 3.7.1-r0 apk -apk-tools 2.14.0-r5 apk -arg_enum_proc_macro 0.3.2 rust-crate -arrayvec 0.7.2 rust-crate -av-metrics 0.9.0 rust-crate -av1-grain 0.2.2 rust-crate -bash 5.2.21-r0 apk -bitflags 1.3.2 rust-crate -bitstream-io 1.6.0 rust-crate -bitstream-io 1.7.0 rust-crate -bitvec 1.0.1 rust-crate -bitvec_helpers 3.1.2 rust-crate -brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r15 apk -busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -cfg-if 1.0.0 rust-crate -cjson 1.7.17-r0 apk -clap 4.0.32 rust-crate -clap_complete 4.0.7 rust-crate -clap_derive 4.0.21 rust-crate -clap_lex 0.3.0 rust-crate -console 0.15.5 rust-crate -coreutils 9.4-r2 apk -coreutils-env 9.4-r2 apk -coreutils-fmt 9.4-r2 apk -coreutils-sha512sum 9.4-r2 apk -crc 3.0.1 rust-crate -crc-catalog 2.2.0 rust-crate -crossbeam 0.8.2 rust-crate -crossbeam-channel 0.5.8 rust-crate -crossbeam-deque 0.8.3 rust-crate -crossbeam-epoch 0.9.14 rust-crate -crossbeam-queue 0.3.8 rust-crate -crossbeam-utils 0.8.15 rust-crate -curl 8.5.0-r0 apk -dbus-libs 1.14.10-r0 apk -dolby_vision 3.2.0 rust-crate -either 1.8.1 rust-crate -fern 0.6.2 rust-crate -ffmpeg 6.1.1-r0 apk -ffmpeg-libavcodec 6.1.1-r0 apk -ffmpeg-libavdevice 6.1.1-r0 apk -ffmpeg-libavfilter 6.1.1-r0 apk -ffmpeg-libavformat 6.1.1-r0 apk -ffmpeg-libavutil 6.1.1-r0 apk -ffmpeg-libpostproc 6.1.1-r0 apk -ffmpeg-libswresample 6.1.1-r0 apk -ffmpeg-libswscale 6.1.1-r0 apk -fontconfig 2.14.2-r4 apk -freetype 2.13.2-r0 apk -fribidi 1.0.13-r0 apk -funty 2.0.0 rust-crate -gdbm 1.23-r1 apk -getrandom 0.2.9 rust-crate -glib 2.78.4-r0 apk -glslang-libs 1.3.261.1-r0 apk -graphite2 1.3.14-r6 apk -harfbuzz 8.3.0-r0 apk -heck 0.4.1 rust-crate -hwdata-pci 0.377.2-r0 apk -interpolate_name 0.2.3 rust-crate -io-lifetimes 1.0.10 rust-crate -is-terminal 0.4.7 rust-crate -itertools 0.10.5 rust-crate -ivf 0.1.2 rust-crate -jq 1.7.1-r0 apk -lab 0.11.0 rust-crate -lame-libs 3.100-r5 apk -lazy_static 1.4.0 rust-crate -lcms2 2.15-r4 apk -libSvtAv1Enc 1.7.0-r0 apk -libacl 2.3.1-r4 apk -libass 0.17.1-r1 apk -libasyncns 0.8-r2 apk -libattr 2.5.1-r5 apk -libblkid 2.39.3-r0 apk -libbluray 1.3.4-r1 apk -libbsd 0.11.7-r3 apk -libbz2 1.0.8-r6 apk -libc 0.2.144 rust-crate -libc 0.2.149 rust-crate -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r5 apk -libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r1 apk -libdovi 3.2.0-r1 apk -libdrm 2.4.118-r0 apk -libexpat 2.6.0-r0 apk -libffi 3.4.4-r3 apk -libflac 1.4.3-r1 apk -libgcc 13.2.1_git20231014-r0 apk -libgcrypt 1.10.3-r0 apk -libgomp 13.2.1_git20231014-r0 apk -libgpg-error 1.47-r2 apk -libhwy 1.0.7-r0 apk -libidn2 2.3.4-r4 apk -libintl 0.22.3-r0 apk -libjpeg-turbo 3.0.1-r0 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r3 apk -libmd 1.1.0-r0 apk -libmediainfo 23.11-r0 apk -libmount 2.39.3-r0 apk -libncursesw 6.4_p20231125-r0 apk -libogg 1.3.5-r5 apk -libopenmpt 0.7.3-r1 apk -libpanelw 6.4_p20231125-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 6.338.1-r0 apk -libpng 1.6.40-r0 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r11 apk -librist 0.2.10-r0 apk -libsharpyuv 1.3.2-r0 apk -libsndfile 1.2.2-r0 apk -libsodium 1.0.19-r0 apk -libsrt 1.5.3-r0 apk -libssh 0.10.6-r0 apk -libssl3 3.1.4-r5 apk -libstdc++ 13.2.1_git20231014-r0 apk -libtheora 1.1.1-r18 apk -libunibreak 5.1-r3 apk -libunistring 1.1-r2 apk -libva 2.20.0-r0 apk -libvdpau 1.5-r2 apk -libvorbis 1.3.7-r2 apk -libvpx 1.13.1-r0 apk -libwebp 1.3.2-r0 apk -libwebpmux 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r3 apk -libxcb 1.16-r0 apk -libxdmcp 1.1.4-r3 apk -libxext 1.3.5-r3 apk -libxfixes 6.0.1-r3 apk -libxml2 2.11.7-r0 apk -libxslt 1.1.39-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.5-r2 apk -lilv-libs 0.24.22-r0 apk -linux-pam 1.5.3-r7 apk -linux-raw-sys 0.3.7 rust-crate -log 0.4.17 rust-crate -lxml 4.9.4 python -maybe-rayon 0.1.1 rust-crate -mbedtls 2.28.7-r0 apk -mediainfo 23.11-r0 apk -memchr 2.5.0 rust-crate -memoffset 0.8.0 rust-crate -minimal-lexical 0.2.1 rust-crate -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.32.3-r0 apk -musl 1.2.4_git20230717-r4 apk -musl-utils 1.2.4_git20230717-r4 apk -ncurses-terminfo-base 6.4_p20231125-r0 apk -netcat-openbsd 1.226-r0 apk -new_debug_unreachable 1.0.4 rust-crate -nghttp2-libs 1.58.0-r0 apk -nom 7.1.3 rust-crate -noop_proc_macro 0.3.0 rust-crate -num-bigint 0.4.3 rust-crate -num-derive 0.3.3 rust-crate -num-integer 0.1.45 rust-crate -num-rational 0.4.1 rust-crate -num-traits 0.2.15 rust-crate -num_cpus 1.15.0 rust-crate -numactl 2.0.16-r4 apk -numpy 1.26.4 python -once_cell 1.17.1 rust-crate -onevpl-libs 2023.3.1-r2 apk -oniguruma 6.9.9-r0 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -os_str_bytes 6.5.0 rust-crate -paste 1.0.12 rust-crate -pcre2 10.42-r2 apk -pillow 10.2.0 python -pip 24.0 python -ppv-lite86 0.2.17 rust-crate -proc-macro-error 1.0.4 rust-crate -proc-macro-error-attr 1.0.4 rust-crate -proc-macro2 1.0.57 rust-crate -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 3.11.8-r0 apk -python3 3.11.8-r0 apk -python3-pyc 3.11.8-r0 apk -python3-pycache-pyc0 3.11.8-r0 apk -quote 1.0.27 rust-crate -radium 0.7.0 rust-crate -rand 0.8.5 rust-crate -rand_chacha 0.3.1 rust-crate -rand_core 0.6.4 rust-crate -rav1e 0.6.6 rust-crate -rav1e-libs 0.6.6-r2 apk -rayon 1.7.0 rust-crate -rayon-core 1.11.0 rust-crate -readline 8.2.1-r2 apk -rust_hawktracer 0.7.0 rust-crate -rust_hawktracer_normal_macro 0.4.1 rust-crate -rust_hawktracer_proc_macro 0.4.1 rust-crate -rustix 0.37.19 rust-crate -scan_fmt 0.2.6 rust-crate -scanelf 1.3.7-r2 apk -scopeguard 1.1.0 rust-crate -sdl2 2.28.5-r0 apk -serd-libs 0.32.0-r0 apk -serde 1.0.163 rust-crate -serde_derive 1.0.163 rust-crate -setuptools 69.1.1 python -shaderc 2023.7-r0 apk -shadow 4.14.2-r0 apk -signal-hook 0.3.15 rust-crate -signal-hook-registry 1.4.1 rust-crate -simd_helpers 0.1.0 rust-crate -skalibs 2.14.0.1-r0 apk -sord-libs 0.16.16-r0 apk -soxr 0.1.3-r7 apk -speexdsp 1.2.1-r2 apk -spirv-tools 1.3.261.1-r0 apk -sqlite-libs 3.44.2-r0 apk -sratom 0.6.16-r0 apk -ssl_client 1.36.1-r15 apk -syn 1.0.109 rust-crate -syn 2.0.16 rust-crate -tap 1.0.1 rust-crate -tdb-libs 1.4.9-r0 apk -termcolor 1.2.0 rust-crate -terminal_size 0.2.6 rust-crate -thiserror 1.0.40 rust-crate -thiserror-impl 1.0.40 rust-crate -tinyxml2 9.0.0-r2 apk -tzdata 2024a-r0 apk -unicode-ident 1.0.8 rust-crate -unicode-width 0.1.10 rust-crate -utmps-libs 0.1.2.2-r0 apk -v4l-utils-libs 1.24.1-r1 apk -v_frame 0.3.3 rust-crate -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.261.1-r0 apk -wayland-libs-client 1.22.0-r4 apk -webrtcvad-wheels 2.0.11.post1 python -wheel 0.42.0 python -wyz 0.5.1 rust-crate -x264-libs 0.164_git20231001-r0 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r2 apk -xz-libs 5.4.5-r0 apk -y4m 0.8.0 rust-crate -zimg 3.0.5-r2 apk -zix-libs 0.4.2-r0 apk -zlib 1.3.1-r0 apk +NAME VERSION TYPE +APScheduler 3.10.4 python +Flask 3.0.2 python +Flask-Cors 4.0.0 python +Flask-Migrate 4.0.5 python +Flask-SQLAlchemy 3.1.1 python +Flask-SocketIO 5.3.6 python +Jinja2 3.1.3 python +Js2Py 0.74 python +Mako 1.3.2 python +Markdown 3.5.2 python +MarkupSafe 2.1.5 python +PySocks 1.7.1 python +PyYAML 6.0.1 python +Pygments 2.17.2 python +SQLAlchemy 2.0.27 python +Simple Launcher 1.1.0.14 dotnet (+5 duplicates) +Unidecode 1.3.8 python +Werkzeug 3.0.1 python +alembic 1.13.1 python +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk +alpine-keys 2.4-r1 apk +alpine-release 3.19.1-r0 apk +alsa-lib 1.2.10-r0 apk +aniso8601 9.0.1 python +anyhow 1.0.71 rust-crate +anyhow 1.0.75 rust-crate +aom-libs 3.7.1-r0 apk +apk-tools 2.14.0-r5 apk +appdirs 1.4.4 python +apprise 1.7.3 python +arg_enum_proc_macro 0.3.2 rust-crate +argparse 1.4.0 python +arrayvec 0.7.2 rust-crate +attrs 23.2.0 python +auditok 0.1.5 python +av-metrics 0.9.0 rust-crate +av1-grain 0.2.2 rust-crate +babelfish 0.6.0 python +backports.functools_lru_cache 2.0.0 python +backports.zoneinfo 0.2.1 python +bash 5.2.21-r0 apk +beautifulsoup4 4.12.3 python +bidict 0.23.1 python +bitflags 1.3.2 rust-crate +bitstream-io 1.6.0 rust-crate +bitstream-io 1.7.0 rust-crate +bitvec 1.0.1 rust-crate +bitvec_helpers 3.1.2 rust-crate +blinker 1.7.0 python +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +c-ares 1.24.0-r1 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +certifi 2024.2.2 python +cfg-if 1.0.0 rust-crate +chardet 5.2.0 python +charset-normalizer 3.3.2 python +cjson 1.7.17-r0 apk +clap 4.0.32 rust-crate +clap_complete 4.0.7 rust-crate +clap_derive 4.0.21 rust-crate +clap_lex 0.3.0 rust-crate +click 8.1.7 python +cloudscraper 1.2.71 python +colorama 0.4.6 python +commonmark 0.9.1 python +console 0.15.5 rust-crate +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk +crc 3.0.1 rust-crate +crc-catalog 2.2.0 rust-crate +crossbeam 0.8.2 rust-crate +crossbeam-channel 0.5.8 rust-crate +crossbeam-deque 0.8.3 rust-crate +crossbeam-epoch 0.9.14 rust-crate +crossbeam-queue 0.3.8 rust-crate +crossbeam-utils 0.8.15 rust-crate +curl 8.5.0-r0 apk +dbus-libs 1.14.10-r0 apk +decorator 5.1.1 python +deep-translator 1.11.4 python +dnspython 2.6.1 python +dogpile.cache 1.3.2 python +dolby_vision 3.2.0 rust-crate +dynaconf 3.2.4 python +either 1.8.1 rust-crate +enzyme 0.4.1 python +fcache 0.5.2 python +fern 0.6.2 rust-crate +fese 0.2.7 python +ffmpeg 6.1.1-r0 apk +ffmpeg-libavcodec 6.1.1-r0 apk +ffmpeg-libavdevice 6.1.1-r0 apk +ffmpeg-libavfilter 6.1.1-r0 apk +ffmpeg-libavformat 6.1.1-r0 apk +ffmpeg-libavutil 6.1.1-r0 apk +ffmpeg-libpostproc 6.1.1-r0 apk +ffmpeg-libswresample 6.1.1-r0 apk +ffmpeg-libswscale 6.1.1-r0 apk +ffmpeg-python 0.2.0 python +ffsubsync 0.4.25 python +flask-restx 1.3.0 python +fontconfig 2.14.2-r4 apk +freetype 2.13.2-r0 apk +fribidi 1.0.13-r0 apk +ftfy 6.1.3 python +funty 2.0.0 rust-crate +future 1.0.0 python +ga4mp 2.0.4 python +gdbm 1.23-r1 apk +getrandom 0.2.9 rust-crate +glib 2.78.4-r0 apk +glslang-libs 1.3.261.1-r0 apk +graphite2 1.3.14-r6 apk +guess-language-spirit 0.5.3 python +guessit 3.8.0 python +h11 0.14.0 python +harfbuzz 8.3.0-r0 apk +heck 0.4.1 rust-crate +html5lib 1.1 python +hwdata-pci 0.377.2-r0 apk +idna 3.6 python +importlib_metadata 7.0.1 python +importlib_resources 6.1.2 python +inflect 7.0.0 python +interpolate_name 0.2.3 rust-crate +io-lifetimes 1.0.10 rust-crate +is-terminal 0.4.7 rust-crate +itertools 0.10.5 rust-crate +itsdangerous 2.1.2 python +ivf 0.1.2 rust-crate +jq 1.7.1-r0 apk +json-tricks 3.17.3 python +jsonschema 4.17.3 python +knowit 0.5.2 python +lab 0.11.0 rust-crate +lame-libs 3.100-r5 apk +lazy_static 1.4.0 rust-crate +lcms2 2.15-r4 apk +libSvtAv1Enc 1.7.0-r0 apk +libacl 2.3.1-r4 apk +libass 0.17.1-r1 apk +libasyncns 0.8-r2 apk +libattr 2.5.1-r5 apk +libblkid 2.39.3-r0 apk +libbluray 1.3.4-r1 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk +libc 0.2.144 rust-crate +libc 0.2.149 rust-crate +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r5 apk +libcurl 8.5.0-r0 apk +libdav1d 1.3.0-r1 apk +libdovi 3.2.0-r1 apk +libdrm 2.4.118-r0 apk +libexpat 2.6.0-r0 apk +libffi 3.4.4-r3 apk +libflac 1.4.3-r1 apk +libgcc 13.2.1_git20231014-r0 apk +libgcrypt 1.10.3-r0 apk +libgomp 13.2.1_git20231014-r0 apk +libgpg-error 1.47-r2 apk +libhwy 1.0.7-r0 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libjxl 0.8.2-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 23.11-r0 apk +libmount 2.39.3-r0 apk +libncursesw 6.4_p20231125-r0 apk +libogg 1.3.5-r5 apk +libopenmpt 0.7.3-r1 apk +libpanelw 6.4_p20231125-r0 apk +libpciaccess 0.17-r2 apk +libplacebo 6.338.1-r0 apk +libpng 1.6.40-r0 apk +libproc2 4.0.4-r0 apk +libpulse 16.1-r11 apk +librist 0.2.10-r0 apk +libsharpyuv 1.3.2-r0 apk +libsndfile 1.2.2-r0 apk +libsodium 1.0.19-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.10.6-r0 apk +libssl3 3.1.4-r5 apk +libstdc++ 13.2.1_git20231014-r0 apk +libtheora 1.1.1-r18 apk +libunibreak 5.1-r3 apk +libunistring 1.1-r2 apk +libva 2.20.0-r0 apk +libvdpau 1.5-r2 apk +libvorbis 1.3.7-r2 apk +libvpx 1.13.1-r0 apk +libwebp 1.3.2-r0 apk +libwebpmux 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk +libxfixes 6.0.1-r3 apk +libxml2 2.11.7-r0 apk +libxslt 1.1.39-r0 apk +libzen 0.4.41-r0 apk +libzmq 4.3.5-r2 apk +lilv-libs 0.24.22-r0 apk +linux-pam 1.5.3-r7 apk +linux-raw-sys 0.3.7 rust-crate +log 0.4.17 rust-crate +lxml 4.9.4 python +maybe-rayon 0.1.1 rust-crate +mbedtls 2.28.7-r0 apk +mediainfo 23.11-r0 apk +memchr 2.5.0 rust-crate +memoffset 0.8.0 rust-crate +minimal-lexical 0.2.1 rust-crate +mpdecimal 2.5.1-r2 apk +mpg123-libs 1.32.3-r0 apk +msgpack 1.0.7 python +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk +netcat-openbsd 1.226-r0 apk +new_debug_unreachable 1.0.4 rust-crate +nghttp2-libs 1.58.0-r0 apk +nom 7.1.3 rust-crate +noop_proc_macro 0.3.0 rust-crate +num-bigint 0.4.3 rust-crate +num-derive 0.3.3 rust-crate +num-integer 0.1.45 rust-crate +num-rational 0.4.1 rust-crate +num-traits 0.2.15 rust-crate +num_cpus 1.15.0 rust-crate +numactl 2.0.16-r4 apk +numpy 1.26.4 python +oauthlib 3.2.2 python +once_cell 1.17.1 rust-crate +onevpl-libs 2023.3.1-r2 apk +oniguruma 6.9.9-r0 apk +opus 1.4-r0 apk +orc 0.4.34-r0 apk +os_str_bytes 6.5.0 rust-crate +paste 1.0.12 rust-crate +pcre2 10.42-r2 apk +pillow 10.2.0 python +pip 24.0 python +platformdirs 4.2.0 python +ppv-lite86 0.2.17 rust-crate +proc-macro-error 1.0.4 rust-crate +proc-macro-error-attr 1.0.4 rust-crate +proc-macro2 1.0.57 rust-crate +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 3.11.8-r0 apk +pycountry 23.12.11 python +pydantic 1.10.14 python +pyjsparser 2.7.1 python +pymediainfo 6.1.0 python +pyparsing 3.1.1 python +pyrsistent 0.20.0 python +pysrt 1.1.2 python +pysubs2 1.6.1 python +python-anticaptcha 1.0.0 python +python-dateutil 2.8.2 python +python-engineio 4.9.0 python +python-socketio 5.11.1 python +python3 3.11.8-r0 apk +python3-pyc 3.11.8-r0 apk +python3-pycache-pyc0 3.11.8-r0 apk +pytz 2024.1 python +pytz_deprecation_shim 0.1.0.post0 python +quote 1.0.27 rust-crate +radium 0.7.0 rust-crate +rand 0.8.5 rust-crate +rand_chacha 0.3.1 rust-crate +rand_core 0.6.4 rust-crate +rarfile 4.1 python +rav1e 0.6.6 rust-crate +rav1e-libs 0.6.6-r2 apk +rayon 1.7.0 rust-crate +rayon-core 1.11.0 rust-crate +readline 8.2.1-r2 apk +rebulk 3.2.0 python +referencing 0.23.0 python +requests 2.31.0 python +requests-oauthlib 1.3.1 python +requests-toolbelt 1.0.0 python +retry 0.9.2 python +rich 13.7.0 python +rust_hawktracer 0.7.0 rust-crate +rust_hawktracer_normal_macro 0.4.1 rust-crate +rust_hawktracer_proc_macro 0.4.1 rust-crate +rustix 0.37.19 rust-crate +scan_fmt 0.2.6 rust-crate +scanelf 1.3.7-r2 apk +scopeguard 1.1.0 rust-crate +sdl2 2.28.5-r0 apk +semver 3.0.2 python +serd-libs 0.32.0-r0 apk +serde 1.0.163 rust-crate +serde_derive 1.0.163 rust-crate +setuptools 69.1.1 python +shaderc 2023.7-r0 apk +shadow 4.14.2-r0 apk +signal-hook 0.3.15 rust-crate +signal-hook-registry 1.4.1 rust-crate +signalrcore 0.9.5 python +simd_helpers 0.1.0 rust-crate +simple-websocket 1.0.0 python +six 1.16.0 python +skalibs 2.14.0.1-r0 apk +sord-libs 0.16.16-r0 apk +soupsieve 2.3.2.post1 python +soxr 0.1.3-r7 apk +speexdsp 1.2.1-r2 apk +spirv-tools 1.3.261.1-r0 apk +sqlite-libs 3.44.2-r0 apk +sratom 0.6.16-r0 apk +srt 3.5.3 python +ssl_client 1.36.1-r15 apk +stevedore 5.2.0 python +syn 1.0.109 rust-crate +syn 2.0.16 rust-crate +tap 1.0.1 rust-crate +tdb-libs 1.4.9-r0 apk +termcolor 1.2.0 rust-crate +terminal_size 0.2.6 rust-crate +thiserror 1.0.40 rust-crate +thiserror-impl 1.0.40 rust-crate +tinyxml2 9.0.0-r2 apk +tld 0.13 python +tqdm 4.66.2 python +trakit 0.2.1 python +typing_extensions 4.10.0 python +tzdata 2024.1 python +tzdata 2024a-r0 apk +tzlocal 5.2 python +unicode-ident 1.0.8 rust-crate +unicode-width 0.1.10 rust-crate +urllib3 2.2.1 python +utmps-libs 0.1.2.2-r0 apk +v4l-utils-libs 1.24.1-r1 apk +v_frame 0.3.3 rust-crate +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.261.1-r0 apk +waitress 3.0.0 python +wayland-libs-client 1.22.0-r4 apk +wcwidth 0.2.13 python +webencodings 0.5.1 python +webrtcvad-wheels 2.0.11.post1 python +websocket-client 1.7.0 python +wheel 0.42.0 python +whichcraft 0.6.1 python +wsproto 1.2.0 python +wyz 0.5.1 rust-crate +x264-libs 0.164_git20231001-r0 apk +x265-libs 3.5-r4 apk +xvidcore 1.3.7-r2 apk +xz-libs 5.4.5-r0 apk +y4m 0.8.0 rust-crate +zimg 3.0.5-r2 apk +zipp 3.17.0 python +zix-libs 0.4.2-r0 apk +zlib 1.3.1-r0 apk From 32ebccfa00c64c5301a04d378f48bcb43d5fb0ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 6 Mar 2024 06:32:11 +0000 Subject: [PATCH 421/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 51b1567..4a79c34 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ either 1.8.1 rust-crate enzyme 0.4.1 python fcache 0.5.2 python fern 0.6.2 rust-crate -fese 0.2.7 python +fese 0.2.9 python ffmpeg 6.1.1-r0 apk ffmpeg-libavcodec 6.1.1-r0 apk ffmpeg-libavdevice 6.1.1-r0 apk From caf086cd9b670809562b81108e94b836ee69a330 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 8 Mar 2024 06:33:17 +0000 Subject: [PATCH 422/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4a79c34..fb92f24 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -65,7 +65,7 @@ clap_complete 4.0.7 rust-crate clap_derive 4.0.21 rust-crate clap_lex 0.3.0 rust-crate click 8.1.7 python -cloudscraper 1.2.71 python +cloudscraper 1.2.58 python colorama 0.4.6 python commonmark 0.9.1 python console 0.15.5 rust-crate From e5032a5ba64cfd94c180b2f12acb7f91d1576be9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Mar 2024 06:36:14 +0000 Subject: [PATCH 423/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fb92f24..621d20e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk apk-tools 2.14.0-r5 apk appdirs 1.4.4 python -apprise 1.7.3 python +apprise 1.7.4 python arg_enum_proc_macro 0.3.2 rust-crate argparse 1.4.0 python arrayvec 0.7.2 rust-crate From 89f53a98ff2dd4b4500af4982a6c91f1c51adba1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Mar 2024 06:30:58 +0000 Subject: [PATCH 424/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 621d20e..cad5e08 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -358,7 +358,7 @@ wcwidth 0.2.13 python webencodings 0.5.1 python webrtcvad-wheels 2.0.11.post1 python websocket-client 1.7.0 python -wheel 0.42.0 python +wheel 0.43.0 python whichcraft 0.6.1 python wsproto 1.2.0 python wyz 0.5.1 rust-crate From 579568621bfa8225ea069d11b5e2157d6f55df68 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Mar 2024 21:21:43 +0000 Subject: [PATCH 425/525] Bot Updating Templated Files --- Jenkinsfile | 61 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6814639..c60b3ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -278,8 +278,15 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update + # Cloned repo paths for templating: + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch development of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch development of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github + # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos + # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github + git clone --branch development --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} @@ -291,13 +298,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" + echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "Jenkinsfile is up to date." fi - # Stage 2 - Delete old templates + echo "Starting 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 Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then @@ -316,13 +323,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" + echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "No templates to delete" fi - # Stage 3 - Update templates + echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -346,9 +353,14 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "No templates to update" fi + echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then @@ -356,6 +368,7 @@ pipeline { cd ${TEMPDIR}/docs/docker-documentation GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') git add docs/images/docker-${CONTAINER_NAME}.md + echo "Updating docs repo" git commit -m 'Bot Updating Documentation' git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ @@ -363,6 +376,8 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + else + echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates @@ -373,6 +388,7 @@ pipeline { sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then @@ -392,16 +408,27 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + else + echo "No updates to Unraid template needed, skipping" fi - # Stage 4 - Sync Readme to Docker Hub if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else echo "Syncing readme to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi + if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then + echo "Docker Hub endpoint doesn't exist. Creating endpoint first." + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X POST \ + -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \ + https://hub.docker.com/v2/repositories/ || : + fi DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') curl -s \ -H "Authorization: JWT ${DH_TOKEN}" \ @@ -466,14 +493,16 @@ pipeline { } steps{ sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ + -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' } } /* ############### From 5e46b14e334d93bcccf0c76007cb06de9430d99f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Mar 2024 21:20:02 +0000 Subject: [PATCH 426/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cad5e08..a5f8654 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -160,7 +160,7 @@ libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libdovi 3.2.0-r1 apk libdrm 2.4.118-r0 apk -libexpat 2.6.0-r0 apk +libexpat 2.6.2-r0 apk libffi 3.4.4-r3 apk libflac 1.4.3-r1 apk libgcc 13.2.1_git20231014-r0 apk @@ -308,7 +308,7 @@ semver 3.0.2 python serd-libs 0.32.0-r0 apk serde 1.0.163 rust-crate serde_derive 1.0.163 rust-crate -setuptools 69.1.1 python +setuptools 69.2.0 python shaderc 2023.7-r0 apk shadow 4.14.2-r0 apk signal-hook 0.3.15 rust-crate From 1bd9925a6c50d86a4c6691c552620838b80cc077 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Mar 2024 21:22:20 +0000 Subject: [PATCH 427/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a5f8654..4d27f52 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,8 +53,8 @@ brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk c-ares 1.24.0-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk +ca-certificates 20240226-r0 apk +ca-certificates-bundle 20240226-r0 apk certifi 2024.2.2 python cfg-if 1.0.0 rust-crate chardet 5.2.0 python From 60cc3231b5ae13b84264969f504494b7b4530ce5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 31 Mar 2024 06:30:26 +0000 Subject: [PATCH 428/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4d27f52..4f550bd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ blinker 1.7.0 python brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r1 apk +c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk certifi 2024.2.2 python @@ -218,7 +218,7 @@ linux-raw-sys 0.3.7 rust-crate log 0.4.17 rust-crate lxml 4.9.4 python maybe-rayon 0.1.1 rust-crate -mbedtls 2.28.7-r0 apk +mbedtls 2.28.8-r0 apk mediainfo 23.11-r0 apk memchr 2.5.0 rust-crate memoffset 0.8.0 rust-crate From 662b78b1365ca2351cfc7b662017f32b0f299473 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Apr 2024 06:32:02 +0000 Subject: [PATCH 429/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4f550bd..86529f9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -251,7 +251,7 @@ orc 0.4.34-r0 apk os_str_bytes 6.5.0 rust-crate paste 1.0.12 rust-crate pcre2 10.42-r2 apk -pillow 10.2.0 python +pillow 10.3.0 python pip 24.0 python platformdirs 4.2.0 python ppv-lite86 0.2.17 rust-crate From 0995ef21669f56a6f31058138ecd3a7594736909 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Apr 2024 21:22:41 +0000 Subject: [PATCH 430/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 86529f9..2cc5923 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ aniso8601 9.0.1 python anyhow 1.0.71 rust-crate anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk -apk-tools 2.14.0-r5 apk +apk-tools 2.14.3-r1 apk appdirs 1.4.4 python apprise 1.7.4 python arg_enum_proc_macro 0.3.2 rust-crate From fbcce9f27d0be5680e4341e257a904a16a8ae763 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 10 Apr 2024 06:32:06 +0000 Subject: [PATCH 431/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2cc5923..8a6f656 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -155,7 +155,7 @@ libbz2 1.0.8-r6 apk libc 0.2.144 rust-crate libc 0.2.149 rust-crate libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r5 apk +libcrypto3 3.1.4-r6 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libdovi 3.2.0-r1 apk @@ -191,7 +191,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.1.4-r5 apk +libssl3 3.1.4-r6 apk libstdc++ 13.2.1_git20231014-r0 apk libtheora 1.1.1-r18 apk libunibreak 5.1-r3 apk From 052c20b0ff42a91912c9965120fa4b9a2a9cdbf7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Apr 2024 06:30:20 +0000 Subject: [PATCH 432/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8a6f656..05a5164 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -260,7 +260,7 @@ proc-macro-error-attr 1.0.4 rust-crate proc-macro2 1.0.57 rust-crate procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python -pyc 3.11.8-r0 apk +pyc 3.11.9-r0 apk pycountry 23.12.11 python pydantic 1.10.14 python pyjsparser 2.7.1 python @@ -273,9 +273,9 @@ python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python python-socketio 5.11.1 python -python3 3.11.8-r0 apk -python3-pyc 3.11.8-r0 apk -python3-pycache-pyc0 3.11.8-r0 apk +python3 3.11.9-r0 apk +python3-pyc 3.11.9-r0 apk +python3-pycache-pyc0 3.11.9-r0 apk pytz 2024.1 python pytz_deprecation_shim 0.1.0.post0 python quote 1.0.27 rust-crate @@ -308,7 +308,7 @@ semver 3.0.2 python serd-libs 0.32.0-r0 apk serde 1.0.163 rust-crate serde_derive 1.0.163 rust-crate -setuptools 69.2.0 python +setuptools 69.5.1 python shaderc 2023.7-r0 apk shadow 4.14.2-r0 apk signal-hook 0.3.15 rust-crate From 357c4e049f154154d3b002d40490ef39bc7c0499 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 16 Apr 2024 06:31:27 +0000 Subject: [PATCH 433/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 05a5164..712046f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk apk-tools 2.14.3-r1 apk appdirs 1.4.4 python -apprise 1.7.4 python +apprise 1.7.6 python arg_enum_proc_macro 0.3.2 rust-crate argparse 1.4.0 python arrayvec 0.7.2 rust-crate From 3f7a05b5f449dd95c0ab17303c4a84aa571421ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 19 Apr 2024 06:32:00 +0000 Subject: [PATCH 434/525] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 712046f..b9d55b0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ aniso8601 9.0.1 python anyhow 1.0.71 rust-crate anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk -apk-tools 2.14.3-r1 apk +apk-tools 2.14.4-r0 apk appdirs 1.4.4 python apprise 1.7.6 python arg_enum_proc_macro 0.3.2 rust-crate @@ -105,6 +105,7 @@ ffmpeg-libswresample 6.1.1-r0 apk ffmpeg-libswscale 6.1.1-r0 apk ffmpeg-python 0.2.0 python ffsubsync 0.4.25 python +findutils 4.9.0-r5 apk flask-restx 1.3.0 python fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk From 752a1bec94ebe5643ef207a7c1d21a488fc3f3c3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 Apr 2024 21:22:10 +0000 Subject: [PATCH 435/525] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c60b3ac..477bf27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -285,7 +285,7 @@ pipeline { # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github git clone --branch development --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} - docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo @@ -618,7 +618,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} From 07911074b5f2c31b54a533c5234eb11d139c08c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 May 2024 06:33:17 +0000 Subject: [PATCH 436/525] Bot Updating Templated Files --- Jenkinsfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 477bf27..86405b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -392,11 +392,15 @@ pipeline { cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + echo "Image is on the ignore list, but no template exist, skipping deprecation" + fi else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From eb22d640d6de8cfc716e1d8550b4591c3d207187 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 9 May 2024 06:34:18 +0000 Subject: [PATCH 437/525] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b9d55b0..b87a614 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,6 +55,7 @@ busybox-binsh 1.36.1-r15 apk c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk +catatonit 0.2.0-r0 apk certifi 2024.2.2 python cfg-if 1.0.0 rust-crate chardet 5.2.0 python @@ -116,7 +117,7 @@ future 1.0.0 python ga4mp 2.0.4 python gdbm 1.23-r1 apk getrandom 0.2.9 rust-crate -glib 2.78.4-r0 apk +glib 2.78.5-r0 apk glslang-libs 1.3.261.1-r0 apk graphite2 1.3.14-r6 apk guess-language-spirit 0.5.3 python From 1ae6083d04f9854d07ed62784f51ac9e78136361 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 10 May 2024 06:32:11 +0000 Subject: [PATCH 438/525] Bot Updating Templated Files --- Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86405b6..f90a11f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -391,16 +391,14 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - echo "Image is on the ignore list, but no template exist, skipping deprecation" - fi + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, and already in the deprecation folder." + elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From c8aaf960c2b096f33523ee7083541e551376bcf2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 12 May 2024 06:32:19 +0000 Subject: [PATCH 439/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b87a614..7453a49 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk apk-tools 2.14.4-r0 apk appdirs 1.4.4 python -apprise 1.7.6 python +apprise 1.8.0 python arg_enum_proc_macro 0.3.2 rust-crate argparse 1.4.0 python arrayvec 0.7.2 rust-crate @@ -117,7 +117,7 @@ future 1.0.0 python ga4mp 2.0.4 python gdbm 1.23-r1 apk getrandom 0.2.9 rust-crate -glib 2.78.5-r0 apk +glib 2.78.6-r0 apk glslang-libs 1.3.261.1-r0 apk graphite2 1.3.14-r6 apk guess-language-spirit 0.5.3 python From a143d89dcf7e092391cdf0ba1edfb5e8d0e29fa1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:21:06 +0000 Subject: [PATCH 440/525] Bot Updating Templated Files --- Jenkinsfile | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f90a11f..9d6d804 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -305,7 +305,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting 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 Dockerfile.armhf" + 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" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -535,6 +535,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -566,6 +567,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -594,6 +596,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -717,7 +720,7 @@ pipeline { --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ + -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ -e PORT=\"${CI_PORT}\" \ @@ -825,35 +828,13 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi - docker manifest push --purge ${MANIFESTIMAGE}:development || : - docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development - docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 - fi - token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-development") - if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development - fi - docker manifest push --purge ${MANIFESTIMAGE}:development - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi done ''' From 27ccd841c54bfe21f11e3dd0e7b9cbb3bf1083a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:23:30 +0000 Subject: [PATCH 441/525] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5506b53..52bb604 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Find us at: # [linuxserver/bazarr](https://github.com/linuxserver/docker-bazarr) -[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbazarr?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fbazarr) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbazarr?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bazarr/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bazarr/packages) From 3debc9f532fea7574e1e9cddc1a09a800646b3e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:27:19 +0000 Subject: [PATCH 442/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7453a49..a7eab23 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -157,7 +157,7 @@ libbz2 1.0.8-r6 apk libc 0.2.144 rust-crate libc 0.2.149 rust-crate libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r6 apk +libcrypto3 3.1.5-r0 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libdovi 3.2.0-r1 apk @@ -193,7 +193,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.1.4-r6 apk +libssl3 3.1.5-r0 apk libstdc++ 13.2.1_git20231014-r0 apk libtheora 1.1.1-r18 apk libunibreak 5.1-r3 apk @@ -210,7 +210,7 @@ libxcb 1.16-r0 apk libxdmcp 1.1.4-r3 apk libxext 1.3.5-r3 apk libxfixes 6.0.1-r3 apk -libxml2 2.11.7-r0 apk +libxml2 2.11.8-r0 apk libxslt 1.1.39-r0 apk libzen 0.4.41-r0 apk libzmq 4.3.5-r2 apk @@ -310,7 +310,7 @@ semver 3.0.2 python serd-libs 0.32.0-r0 apk serde 1.0.163 rust-crate serde_derive 1.0.163 rust-crate -setuptools 69.5.1 python +setuptools 70.0.0 python shaderc 2023.7-r0 apk shadow 4.14.2-r0 apk signal-hook 0.3.15 rust-crate From ac417e09d053d9aaee8360bb348f78c37877a7d9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 24 May 2024 06:34:03 +0000 Subject: [PATCH 443/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a7eab23..cd7d452 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,8 +50,8 @@ bitvec 1.0.1 rust-crate bitvec_helpers 3.1.2 rust-crate blinker 1.7.0 python brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r15 apk -busybox-binsh 1.36.1-r15 apk +busybox 1.36.1-r18 apk +busybox-binsh 1.36.1-r18 apk c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk @@ -328,7 +328,7 @@ spirv-tools 1.3.261.1-r0 apk sqlite-libs 3.44.2-r0 apk sratom 0.6.16-r0 apk srt 3.5.3 python -ssl_client 1.36.1-r15 apk +ssl_client 1.36.1-r18 apk stevedore 5.2.0 python syn 1.0.109 rust-crate syn 2.0.16 rust-crate From 8d5e466b2af2301184c6c18769d8e53852dafc9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 24 May 2024 17:32:35 +0000 Subject: [PATCH 444/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index cd7d452..eb79b7c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ anyhow 1.0.75 rust-crate aom-libs 3.7.1-r0 apk apk-tools 2.14.4-r0 apk appdirs 1.4.4 python -apprise 1.8.0 python +apprise 1.7.6 python arg_enum_proc_macro 0.3.2 rust-crate argparse 1.4.0 python arrayvec 0.7.2 rust-crate From 837c626d5747eb8f59fd5b0fb4bc5c5824c4d853 Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Thu, 6 Jun 2024 17:44:10 +0100 Subject: [PATCH 445/525] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- README.md | 6 +----- jenkins-vars.yml | 4 ++-- readme-vars.yml | 16 +++------------- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index e71de9b..2286e53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -53,9 +53,10 @@ 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/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 32bb1da..0965cdd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -53,9 +53,10 @@ 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/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index 9d6d804..476fbc9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='6767' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/system/status' } stages { diff --git a/README.md b/README.md index 52bb604..a414f3e 100644 --- a/README.md +++ b/README.md @@ -99,11 +99,6 @@ docker run -d \ lscr.io/linuxserver/bazarr:development ``` -You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. -Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development -The development tag will be the latest commit in the development branch of bazarr. - - ## Parameters Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -277,6 +272,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 668af67..fb1ab59 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,8 +24,8 @@ repo_vars: - CI_PORT='6767' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/system/status' sponsor_links: - { name: "Bazarr", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" } diff --git a/readme-vars.yml b/readme-vars.yml index a24f57b..449725e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -10,13 +10,7 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# Optional Block -optional_block_1: true -optional_block_1_items: - - | - You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. - Add one of the tags, if required, to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development - The development tag will be the latest commit in the development branch of bazarr. + # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true @@ -25,11 +19,6 @@ param_volumes: param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} -param_usage_include_env: true -param_env_vars: - - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} -# optional env variables -opt_param_usage_include_env: false # application setup block app_setup_block_enabled: true app_setup_block: | @@ -37,7 +26,8 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18"} From 31d1a4e2126d42b045b056d28f27d6ef0790a5b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 9 Jun 2024 06:33:55 +0000 Subject: [PATCH 446/525] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index eb79b7c..15a68a0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -270,7 +270,7 @@ pymediainfo 6.1.0 python pyparsing 3.1.1 python pyrsistent 0.20.0 python pysrt 1.1.2 python -pysubs2 1.6.1 python +pysubs2 1.7.2 python python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python @@ -336,6 +336,7 @@ tap 1.0.1 rust-crate tdb-libs 1.4.9-r0 apk termcolor 1.2.0 rust-crate terminal_size 0.2.6 rust-crate +textdistance 4.6.2 python thiserror 1.0.40 rust-crate thiserror-impl 1.0.40 rust-crate tinyxml2 9.0.0-r2 apk From 373a20b1756788965041a858f26c8bae29c4f7f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Jun 2024 06:37:25 +0000 Subject: [PATCH 447/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 15a68a0..7569942 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,8 +50,8 @@ bitvec 1.0.1 rust-crate bitvec_helpers 3.1.2 rust-crate blinker 1.7.0 python brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r18 apk -busybox-binsh 1.36.1-r18 apk +busybox 1.36.1-r19 apk +busybox-binsh 1.36.1-r19 apk c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk @@ -243,7 +243,7 @@ num-rational 0.4.1 rust-crate num-traits 0.2.15 rust-crate num_cpus 1.15.0 rust-crate numactl 2.0.16-r4 apk -numpy 1.26.4 python +numpy 2.0.0 python oauthlib 3.2.2 python once_cell 1.17.1 rust-crate onevpl-libs 2023.3.1-r2 apk @@ -328,7 +328,7 @@ spirv-tools 1.3.261.1-r0 apk sqlite-libs 3.44.2-r0 apk sratom 0.6.16-r0 apk srt 3.5.3 python -ssl_client 1.36.1-r18 apk +ssl_client 1.36.1-r19 apk stevedore 5.2.0 python syn 1.0.109 rust-crate syn 2.0.16 rust-crate From b332e7e366b1aa1c6c5ec7d824a613755fa1a9b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 19 Jun 2024 17:04:46 +0000 Subject: [PATCH 448/525] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a414f3e..4989318 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **01.06.24:** - Rebase to Alpine 3.20. +* **06.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. From 4d61683cb16a26024639ab7de0ac35f36c882abb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 19 Jun 2024 17:08:25 +0000 Subject: [PATCH 449/525] Bot Updating Package Versions --- package_versions.txt | 666 +++++++++++++++++++------------------------ 1 file changed, 290 insertions(+), 376 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7569942..34dccff 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,376 +1,290 @@ -NAME VERSION TYPE -APScheduler 3.10.4 python -Flask 3.0.2 python -Flask-Cors 4.0.0 python -Flask-Migrate 4.0.5 python -Flask-SQLAlchemy 3.1.1 python -Flask-SocketIO 5.3.6 python -Jinja2 3.1.3 python -Js2Py 0.74 python -Mako 1.3.2 python -Markdown 3.5.2 python -MarkupSafe 2.1.5 python -PySocks 1.7.1 python -PyYAML 6.0.1 python -Pygments 2.17.2 python -SQLAlchemy 2.0.27 python -Simple Launcher 1.1.0.14 dotnet (+5 duplicates) -Unidecode 1.3.8 python -Werkzeug 3.0.1 python -alembic 1.13.1 python -alpine-baselayout 3.4.3-r2 apk -alpine-baselayout-data 3.4.3-r2 apk -alpine-keys 2.4-r1 apk -alpine-release 3.19.1-r0 apk -alsa-lib 1.2.10-r0 apk -aniso8601 9.0.1 python -anyhow 1.0.71 rust-crate -anyhow 1.0.75 rust-crate -aom-libs 3.7.1-r0 apk -apk-tools 2.14.4-r0 apk -appdirs 1.4.4 python -apprise 1.7.6 python -arg_enum_proc_macro 0.3.2 rust-crate -argparse 1.4.0 python -arrayvec 0.7.2 rust-crate -attrs 23.2.0 python -auditok 0.1.5 python -av-metrics 0.9.0 rust-crate -av1-grain 0.2.2 rust-crate -babelfish 0.6.0 python -backports.functools_lru_cache 2.0.0 python -backports.zoneinfo 0.2.1 python -bash 5.2.21-r0 apk -beautifulsoup4 4.12.3 python -bidict 0.23.1 python -bitflags 1.3.2 rust-crate -bitstream-io 1.6.0 rust-crate -bitstream-io 1.7.0 rust-crate -bitvec 1.0.1 rust-crate -bitvec_helpers 3.1.2 rust-crate -blinker 1.7.0 python -brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r19 apk -busybox-binsh 1.36.1-r19 apk -c-ares 1.27.0-r0 apk -ca-certificates 20240226-r0 apk -ca-certificates-bundle 20240226-r0 apk -catatonit 0.2.0-r0 apk -certifi 2024.2.2 python -cfg-if 1.0.0 rust-crate -chardet 5.2.0 python -charset-normalizer 3.3.2 python -cjson 1.7.17-r0 apk -clap 4.0.32 rust-crate -clap_complete 4.0.7 rust-crate -clap_derive 4.0.21 rust-crate -clap_lex 0.3.0 rust-crate -click 8.1.7 python -cloudscraper 1.2.58 python -colorama 0.4.6 python -commonmark 0.9.1 python -console 0.15.5 rust-crate -coreutils 9.4-r2 apk -coreutils-env 9.4-r2 apk -coreutils-fmt 9.4-r2 apk -coreutils-sha512sum 9.4-r2 apk -crc 3.0.1 rust-crate -crc-catalog 2.2.0 rust-crate -crossbeam 0.8.2 rust-crate -crossbeam-channel 0.5.8 rust-crate -crossbeam-deque 0.8.3 rust-crate -crossbeam-epoch 0.9.14 rust-crate -crossbeam-queue 0.3.8 rust-crate -crossbeam-utils 0.8.15 rust-crate -curl 8.5.0-r0 apk -dbus-libs 1.14.10-r0 apk -decorator 5.1.1 python -deep-translator 1.11.4 python -dnspython 2.6.1 python -dogpile.cache 1.3.2 python -dolby_vision 3.2.0 rust-crate -dynaconf 3.2.4 python -either 1.8.1 rust-crate -enzyme 0.4.1 python -fcache 0.5.2 python -fern 0.6.2 rust-crate -fese 0.2.9 python -ffmpeg 6.1.1-r0 apk -ffmpeg-libavcodec 6.1.1-r0 apk -ffmpeg-libavdevice 6.1.1-r0 apk -ffmpeg-libavfilter 6.1.1-r0 apk -ffmpeg-libavformat 6.1.1-r0 apk -ffmpeg-libavutil 6.1.1-r0 apk -ffmpeg-libpostproc 6.1.1-r0 apk -ffmpeg-libswresample 6.1.1-r0 apk -ffmpeg-libswscale 6.1.1-r0 apk -ffmpeg-python 0.2.0 python -ffsubsync 0.4.25 python -findutils 4.9.0-r5 apk -flask-restx 1.3.0 python -fontconfig 2.14.2-r4 apk -freetype 2.13.2-r0 apk -fribidi 1.0.13-r0 apk -ftfy 6.1.3 python -funty 2.0.0 rust-crate -future 1.0.0 python -ga4mp 2.0.4 python -gdbm 1.23-r1 apk -getrandom 0.2.9 rust-crate -glib 2.78.6-r0 apk -glslang-libs 1.3.261.1-r0 apk -graphite2 1.3.14-r6 apk -guess-language-spirit 0.5.3 python -guessit 3.8.0 python -h11 0.14.0 python -harfbuzz 8.3.0-r0 apk -heck 0.4.1 rust-crate -html5lib 1.1 python -hwdata-pci 0.377.2-r0 apk -idna 3.6 python -importlib_metadata 7.0.1 python -importlib_resources 6.1.2 python -inflect 7.0.0 python -interpolate_name 0.2.3 rust-crate -io-lifetimes 1.0.10 rust-crate -is-terminal 0.4.7 rust-crate -itertools 0.10.5 rust-crate -itsdangerous 2.1.2 python -ivf 0.1.2 rust-crate -jq 1.7.1-r0 apk -json-tricks 3.17.3 python -jsonschema 4.17.3 python -knowit 0.5.2 python -lab 0.11.0 rust-crate -lame-libs 3.100-r5 apk -lazy_static 1.4.0 rust-crate -lcms2 2.15-r4 apk -libSvtAv1Enc 1.7.0-r0 apk -libacl 2.3.1-r4 apk -libass 0.17.1-r1 apk -libasyncns 0.8-r2 apk -libattr 2.5.1-r5 apk -libblkid 2.39.3-r0 apk -libbluray 1.3.4-r1 apk -libbsd 0.11.7-r3 apk -libbz2 1.0.8-r6 apk -libc 0.2.144 rust-crate -libc 0.2.149 rust-crate -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.5-r0 apk -libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r1 apk -libdovi 3.2.0-r1 apk -libdrm 2.4.118-r0 apk -libexpat 2.6.2-r0 apk -libffi 3.4.4-r3 apk -libflac 1.4.3-r1 apk -libgcc 13.2.1_git20231014-r0 apk -libgcrypt 1.10.3-r0 apk -libgomp 13.2.1_git20231014-r0 apk -libgpg-error 1.47-r2 apk -libhwy 1.0.7-r0 apk -libidn2 2.3.4-r4 apk -libintl 0.22.3-r0 apk -libjpeg-turbo 3.0.1-r0 apk -libjxl 0.8.2-r0 apk -libltdl 2.4.7-r3 apk -libmd 1.1.0-r0 apk -libmediainfo 23.11-r0 apk -libmount 2.39.3-r0 apk -libncursesw 6.4_p20231125-r0 apk -libogg 1.3.5-r5 apk -libopenmpt 0.7.3-r1 apk -libpanelw 6.4_p20231125-r0 apk -libpciaccess 0.17-r2 apk -libplacebo 6.338.1-r0 apk -libpng 1.6.40-r0 apk -libproc2 4.0.4-r0 apk -libpulse 16.1-r11 apk -librist 0.2.10-r0 apk -libsharpyuv 1.3.2-r0 apk -libsndfile 1.2.2-r0 apk -libsodium 1.0.19-r0 apk -libsrt 1.5.3-r0 apk -libssh 0.10.6-r0 apk -libssl3 3.1.5-r0 apk -libstdc++ 13.2.1_git20231014-r0 apk -libtheora 1.1.1-r18 apk -libunibreak 5.1-r3 apk -libunistring 1.1-r2 apk -libva 2.20.0-r0 apk -libvdpau 1.5-r2 apk -libvorbis 1.3.7-r2 apk -libvpx 1.13.1-r0 apk -libwebp 1.3.2-r0 apk -libwebpmux 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r3 apk -libxcb 1.16-r0 apk -libxdmcp 1.1.4-r3 apk -libxext 1.3.5-r3 apk -libxfixes 6.0.1-r3 apk -libxml2 2.11.8-r0 apk -libxslt 1.1.39-r0 apk -libzen 0.4.41-r0 apk -libzmq 4.3.5-r2 apk -lilv-libs 0.24.22-r0 apk -linux-pam 1.5.3-r7 apk -linux-raw-sys 0.3.7 rust-crate -log 0.4.17 rust-crate -lxml 4.9.4 python -maybe-rayon 0.1.1 rust-crate -mbedtls 2.28.8-r0 apk -mediainfo 23.11-r0 apk -memchr 2.5.0 rust-crate -memoffset 0.8.0 rust-crate -minimal-lexical 0.2.1 rust-crate -mpdecimal 2.5.1-r2 apk -mpg123-libs 1.32.3-r0 apk -msgpack 1.0.7 python -musl 1.2.4_git20230717-r4 apk -musl-utils 1.2.4_git20230717-r4 apk -ncurses-terminfo-base 6.4_p20231125-r0 apk -netcat-openbsd 1.226-r0 apk -new_debug_unreachable 1.0.4 rust-crate -nghttp2-libs 1.58.0-r0 apk -nom 7.1.3 rust-crate -noop_proc_macro 0.3.0 rust-crate -num-bigint 0.4.3 rust-crate -num-derive 0.3.3 rust-crate -num-integer 0.1.45 rust-crate -num-rational 0.4.1 rust-crate -num-traits 0.2.15 rust-crate -num_cpus 1.15.0 rust-crate -numactl 2.0.16-r4 apk -numpy 2.0.0 python -oauthlib 3.2.2 python -once_cell 1.17.1 rust-crate -onevpl-libs 2023.3.1-r2 apk -oniguruma 6.9.9-r0 apk -opus 1.4-r0 apk -orc 0.4.34-r0 apk -os_str_bytes 6.5.0 rust-crate -paste 1.0.12 rust-crate -pcre2 10.42-r2 apk -pillow 10.3.0 python -pip 24.0 python -platformdirs 4.2.0 python -ppv-lite86 0.2.17 rust-crate -proc-macro-error 1.0.4 rust-crate -proc-macro-error-attr 1.0.4 rust-crate -proc-macro2 1.0.57 rust-crate -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python -pyc 3.11.9-r0 apk -pycountry 23.12.11 python -pydantic 1.10.14 python -pyjsparser 2.7.1 python -pymediainfo 6.1.0 python -pyparsing 3.1.1 python -pyrsistent 0.20.0 python -pysrt 1.1.2 python -pysubs2 1.7.2 python -python-anticaptcha 1.0.0 python -python-dateutil 2.8.2 python -python-engineio 4.9.0 python -python-socketio 5.11.1 python -python3 3.11.9-r0 apk -python3-pyc 3.11.9-r0 apk -python3-pycache-pyc0 3.11.9-r0 apk -pytz 2024.1 python -pytz_deprecation_shim 0.1.0.post0 python -quote 1.0.27 rust-crate -radium 0.7.0 rust-crate -rand 0.8.5 rust-crate -rand_chacha 0.3.1 rust-crate -rand_core 0.6.4 rust-crate -rarfile 4.1 python -rav1e 0.6.6 rust-crate -rav1e-libs 0.6.6-r2 apk -rayon 1.7.0 rust-crate -rayon-core 1.11.0 rust-crate -readline 8.2.1-r2 apk -rebulk 3.2.0 python -referencing 0.23.0 python -requests 2.31.0 python -requests-oauthlib 1.3.1 python -requests-toolbelt 1.0.0 python -retry 0.9.2 python -rich 13.7.0 python -rust_hawktracer 0.7.0 rust-crate -rust_hawktracer_normal_macro 0.4.1 rust-crate -rust_hawktracer_proc_macro 0.4.1 rust-crate -rustix 0.37.19 rust-crate -scan_fmt 0.2.6 rust-crate -scanelf 1.3.7-r2 apk -scopeguard 1.1.0 rust-crate -sdl2 2.28.5-r0 apk -semver 3.0.2 python -serd-libs 0.32.0-r0 apk -serde 1.0.163 rust-crate -serde_derive 1.0.163 rust-crate -setuptools 70.0.0 python -shaderc 2023.7-r0 apk -shadow 4.14.2-r0 apk -signal-hook 0.3.15 rust-crate -signal-hook-registry 1.4.1 rust-crate -signalrcore 0.9.5 python -simd_helpers 0.1.0 rust-crate -simple-websocket 1.0.0 python -six 1.16.0 python -skalibs 2.14.0.1-r0 apk -sord-libs 0.16.16-r0 apk -soupsieve 2.3.2.post1 python -soxr 0.1.3-r7 apk -speexdsp 1.2.1-r2 apk -spirv-tools 1.3.261.1-r0 apk -sqlite-libs 3.44.2-r0 apk -sratom 0.6.16-r0 apk -srt 3.5.3 python -ssl_client 1.36.1-r19 apk -stevedore 5.2.0 python -syn 1.0.109 rust-crate -syn 2.0.16 rust-crate -tap 1.0.1 rust-crate -tdb-libs 1.4.9-r0 apk -termcolor 1.2.0 rust-crate -terminal_size 0.2.6 rust-crate -textdistance 4.6.2 python -thiserror 1.0.40 rust-crate -thiserror-impl 1.0.40 rust-crate -tinyxml2 9.0.0-r2 apk -tld 0.13 python -tqdm 4.66.2 python -trakit 0.2.1 python -typing_extensions 4.10.0 python -tzdata 2024.1 python -tzdata 2024a-r0 apk -tzlocal 5.2 python -unicode-ident 1.0.8 rust-crate -unicode-width 0.1.10 rust-crate -urllib3 2.2.1 python -utmps-libs 0.1.2.2-r0 apk -v4l-utils-libs 1.24.1-r1 apk -v_frame 0.3.3 rust-crate -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.261.1-r0 apk -waitress 3.0.0 python -wayland-libs-client 1.22.0-r4 apk -wcwidth 0.2.13 python -webencodings 0.5.1 python -webrtcvad-wheels 2.0.11.post1 python -websocket-client 1.7.0 python -wheel 0.43.0 python -whichcraft 0.6.1 python -wsproto 1.2.0 python -wyz 0.5.1 rust-crate -x264-libs 0.164_git20231001-r0 apk -x265-libs 3.5-r4 apk -xvidcore 1.3.7-r2 apk -xz-libs 5.4.5-r0 apk -y4m 0.8.0 rust-crate -zimg 3.0.5-r2 apk -zipp 3.17.0 python -zix-libs 0.4.2-r0 apk -zlib 1.3.1-r0 apk +NAME VERSION TYPE +APScheduler 3.10.4 python +Flask 3.0.2 python +Flask-Cors 4.0.0 python +Flask-Migrate 4.0.5 python +Flask-SQLAlchemy 3.1.1 python +Flask-SocketIO 5.3.6 python +Jinja2 3.1.3 python +Js2Py 0.74 python +Mako 1.3.2 python +Markdown 3.5.2 python +MarkupSafe 2.1.5 python +PySocks 1.7.1 python +PyYAML 6.0.1 python +Pygments 2.17.2 python +SQLAlchemy 2.0.27 python +Simple Launcher 1.1.0.14 dotnet (+5 duplicates) +Unidecode 1.3.8 python +Werkzeug 3.0.1 python +alembic 1.13.1 python +alpine-baselayout 3.6.5-r0 apk +alpine-baselayout-data 3.6.5-r0 apk +alpine-keys 2.4-r1 apk +alpine-release 3.20.0-r0 apk +alsa-lib 1.2.11-r0 apk +aniso8601 9.0.1 python +aom-libs 3.9.0-r0 apk +apk-tools 2.14.4-r0 apk +appdirs 1.4.4 python +apprise 1.7.6 python +argparse 1.4.0 python +attrs 23.2.0 python +auditok 0.1.5 python +babelfish 0.6.0 python +backports.functools_lru_cache 2.0.0 python +backports.zoneinfo 0.2.1 python +bash 5.2.26-r0 apk +beautifulsoup4 4.12.3 python +bidict 0.23.1 python +blinker 1.7.0 python +brotli-libs 1.1.0-r2 apk +busybox 1.36.1-r29 apk +busybox-binsh 1.36.1-r29 apk +c-ares 1.28.1-r0 apk +ca-certificates 20240226-r0 apk +ca-certificates-bundle 20240226-r0 apk +catatonit 0.2.0-r0 apk +certifi 2024.2.2 python +chardet 5.2.0 python +charset-normalizer 3.3.2 python +cjson 1.7.18-r0 apk +click 8.1.7 python +cloudscraper 1.2.58 python +colorama 0.4.6 python +commonmark 0.9.1 python +coreutils 9.5-r1 apk +coreutils-env 9.5-r1 apk +coreutils-fmt 9.5-r1 apk +coreutils-sha512sum 9.5-r1 apk +curl 8.7.1-r0 apk +dbus-libs 1.14.10-r1 apk +decorator 5.1.1 python +deep-translator 1.11.4 python +dnspython 2.6.1 python +dogpile.cache 1.3.2 python +dynaconf 3.2.4 python +enzyme 0.4.1 python +fcache 0.5.2 python +fese 0.2.9 python +ffmpeg 6.1.1-r8 apk +ffmpeg-libavcodec 6.1.1-r8 apk +ffmpeg-libavdevice 6.1.1-r8 apk +ffmpeg-libavfilter 6.1.1-r8 apk +ffmpeg-libavformat 6.1.1-r8 apk +ffmpeg-libavutil 6.1.1-r8 apk +ffmpeg-libpostproc 6.1.1-r8 apk +ffmpeg-libswresample 6.1.1-r8 apk +ffmpeg-libswscale 6.1.1-r8 apk +ffmpeg-python 0.2.0 python +ffsubsync 0.4.25 python +findutils 4.9.0-r5 apk +flask-restx 1.3.0 python +fontconfig 2.15.0-r1 apk +freetype 2.13.2-r0 apk +fribidi 1.0.15-r0 apk +ftfy 6.1.3 python +future 1.0.0 python +ga4mp 2.0.4 python +gdbm 1.23-r1 apk +giflib 5.2.2-r0 apk +glib 2.80.2-r0 apk +glslang-libs 1.3.261.1-r0 apk +graphite2 1.3.14-r6 apk +guess-language-spirit 0.5.3 python +guessit 3.8.0 python +h11 0.14.0 python +harfbuzz 8.5.0-r0 apk +html5lib 1.1 python +hwdata-pci 0.382-r0 apk +idna 3.6 python +imath 3.1.11-r2 apk +importlib_metadata 7.0.1 python +importlib_resources 6.1.2 python +inflect 7.0.0 python +itsdangerous 2.1.2 python +jq 1.7.1-r0 apk +json-tricks 3.17.3 python +jsonschema 4.17.3 python +knowit 0.5.2 python +lame-libs 3.100-r5 apk +lcms2 2.16-r0 apk +libSvtAv1Enc 2.0.0-r1 apk +libacl 2.3.2-r0 apk +libass 0.17.2-r0 apk +libasyncns 0.8-r3 apk +libattr 2.5.2-r0 apk +libblkid 2.40.1-r1 apk +libbluray 1.3.4-r1 apk +libbsd 0.12.2-r0 apk +libbz2 1.0.8-r6 apk +libcrypto3 3.3.1-r0 apk +libcurl 8.7.1-r0 apk +libdav1d 1.4.2-r0 apk +libdovi 3.3.0-r0 apk +libdrm 2.4.120-r0 apk +libeconf 0.6.3-r0 apk +libexpat 2.6.2-r0 apk +libffi 3.4.6-r0 apk +libflac 1.4.3-r1 apk +libgcc 13.2.1_git20240309-r0 apk +libgcrypt 1.10.3-r0 apk +libgomp 13.2.1_git20240309-r0 apk +libgpg-error 1.49-r0 apk +libhwy 1.0.7-r0 apk +libidn2 2.3.7-r0 apk +libintl 0.22.5-r0 apk +libjpeg-turbo 3.0.3-r0 apk +libjxl 0.10.2-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 24.04-r0 apk +libmount 2.40.1-r1 apk +libncursesw 6.4_p20240420-r0 apk +libogg 1.3.5-r5 apk +libopenmpt 0.7.7-r0 apk +libpanelw 6.4_p20240420-r0 apk +libpciaccess 0.18.1-r0 apk +libplacebo 6.338.2-r1 apk +libpng 1.6.43-r0 apk +libproc2 4.0.4-r0 apk +libpsl 0.21.5-r1 apk +libpulse 17.0-r0 apk +librist 0.2.10-r1 apk +libsharpyuv 1.3.2-r0 apk +libsndfile 1.2.2-r0 apk +libsodium 1.0.19-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.10.6-r0 apk +libssl3 3.3.1-r0 apk +libstdc++ 13.2.1_git20240309-r0 apk +libtheora 1.1.1-r18 apk +libunibreak 6.1-r0 apk +libunistring 1.2-r0 apk +libva 2.21.0-r0 apk +libvdpau 1.5-r3 apk +libvorbis 1.3.7-r2 apk +libvpx 1.14.1-r0 apk +libwebp 1.3.2-r0 apk +libwebpmux 1.3.2-r0 apk +libx11 1.8.9-r1 apk +libxau 1.0.11-r4 apk +libxcb 1.16.1-r0 apk +libxdmcp 1.1.5-r1 apk +libxext 1.3.6-r2 apk +libxfixes 6.0.1-r4 apk +libxml2 2.12.7-r0 apk +libxslt 1.1.39-r1 apk +libzen 0.4.41-r0 apk +libzmq 4.3.5-r2 apk +lilv-libs 0.24.24-r1 apk +linux-pam 1.6.0-r0 apk +lxml 4.9.4 python +mbedtls 3.6.0-r0 apk +mediainfo 24.04-r0 apk +mpdecimal 4.0.0-r0 apk +mpg123-libs 1.32.6-r0 apk +msgpack 1.0.7 python +musl 1.2.5-r0 apk +musl-utils 1.2.5-r0 apk +ncurses-terminfo-base 6.4_p20240420-r0 apk +netcat-openbsd 1.226-r0 apk +nghttp2-libs 1.62.0-r0 apk +numactl 2.0.18-r0 apk +numpy 2.0.0 python +oauthlib 3.2.2 python +onevpl-libs 2023.3.1-r2 apk +oniguruma 6.9.9-r0 apk +openexr-libiex 3.1.13-r1 apk +openexr-libilmthread 3.1.13-r1 apk +openexr-libopenexr 3.1.13-r1 apk +opus 1.5.2-r0 apk +orc 0.4.37-r0 apk +pcre2 10.43-r0 apk +pillow 10.3.0 python +pip 24.0 python +platformdirs 4.2.0 python +procps-ng 4.0.4-r0 apk +psycopg2-binary 2.9.9 python +pyc 3.12.3-r1 apk +pycountry 23.12.11 python +pydantic 1.10.14 python +pyjsparser 2.7.1 python +pymediainfo 6.1.0 python +pyparsing 3.1.1 python +pyrsistent 0.20.0 python +pysrt 1.1.2 python +pysubs2 1.7.2 python +python-anticaptcha 1.0.0 python +python-dateutil 2.8.2 python +python-engineio 4.9.0 python +python-socketio 5.11.1 python +python3 3.12.3-r1 apk +python3-pyc 3.12.3-r1 apk +python3-pycache-pyc0 3.12.3-r1 apk +pytz 2024.1 python +pytz_deprecation_shim 0.1.0.post0 python +rarfile 4.1 python +rav1e-libs 0.7.1-r0 apk +readline 8.2.10-r0 apk +rebulk 3.2.0 python +referencing 0.23.0 python +requests 2.31.0 python +requests-oauthlib 1.3.1 python +requests-toolbelt 1.0.0 python +retry 0.9.2 python +rich 13.7.0 python +scanelf 1.3.7-r2 apk +sdl2 2.28.5-r1 apk +semver 3.0.2 python +serd-libs 0.32.2-r0 apk +setuptools 70.1.0 python +shaderc 2024.0-r0 apk +shadow 4.15.1-r0 apk +signalrcore 0.9.5 python +simple-websocket 1.0.0 python +six 1.16.0 python +skalibs 2.14.1.1-r0 apk +sord-libs 0.16.16-r0 apk +soupsieve 2.3.2.post1 python +soxr 0.1.3-r7 apk +speexdsp 1.2.1-r2 apk +spirv-tools 1.3.261.1-r0 apk +sqlite-libs 3.45.3-r1 apk +sratom 0.6.16-r0 apk +srt 3.5.3 python +ssl_client 1.36.1-r29 apk +stevedore 5.2.0 python +tdb-libs 1.4.9-r1 apk +textdistance 4.6.2 python +tinyxml2 10.0.0-r0 apk +tld 0.13 python +tqdm 4.66.2 python +trakit 0.2.1 python +typing_extensions 4.10.0 python +tzdata 2024.1 python +tzdata 2024a-r1 apk +tzlocal 5.2 python +urllib3 2.2.1 python +utmps-libs 0.1.2.2-r1 apk +v4l-utils-libs 1.24.1-r1 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.261.1-r0 apk +waitress 3.0.0 python +wayland-libs-client 1.22.0-r4 apk +wcwidth 0.2.13 python +webencodings 0.5.1 python +webrtcvad-wheels 2.0.11.post1 python +websocket-client 1.7.0 python +wheel 0.43.0 python +whichcraft 0.6.1 python +wsproto 1.2.0 python +x264-libs 0.164_git20231001-r0 apk +x265-libs 3.6-r0 apk +xvidcore 1.3.7-r2 apk +xz-libs 5.6.1-r3 apk +zimg 3.0.5-r2 apk +zipp 3.17.0 python +zix-libs 0.4.2-r0 apk +zlib 1.3.1-r1 apk +zstd-libs 1.5.6-r0 apk From f1b27bd9c67c48bdb55065481175af66931e72b8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 21 Jun 2024 06:35:53 +0000 Subject: [PATCH 450/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 34dccff..efbd584 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -202,7 +202,7 @@ opus 1.5.2-r0 apk orc 0.4.37-r0 apk pcre2 10.43-r0 apk pillow 10.3.0 python -pip 24.0 python +pip 24.1 python platformdirs 4.2.0 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python From 812bfb55eb33a427c69626269497e72304f1c39d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Jun 2024 06:36:47 +0000 Subject: [PATCH 451/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index efbd584..f2bb220 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ alembic 1.13.1 python alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.0-r0 apk +alpine-release 3.20.1-r0 apk alsa-lib 1.2.11-r0 apk aniso8601 9.0.1 python aom-libs 3.9.0-r0 apk From 06f1420dc7c89d5cd8b80577c848698597563cbf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Jun 2024 21:23:50 +0000 Subject: [PATCH 452/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f2bb220..3eee3c3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -238,7 +238,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 70.1.0 python +setuptools 70.1.1 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From d1a42afab60a24fa0439e181d431c31a06a92524 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 29 Jun 2024 06:35:05 +0000 Subject: [PATCH 453/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3eee3c3..270003b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -202,7 +202,7 @@ opus 1.5.2-r0 apk orc 0.4.37-r0 apk pcre2 10.43-r0 apk pillow 10.3.0 python -pip 24.1 python +pip 24.1.1 python platformdirs 4.2.0 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python From adba4fe76f6c0e8063a413c8b23901fadca1cf4a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Jul 2024 06:39:19 +0000 Subject: [PATCH 454/525] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 270003b..8cd5e7b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.7.1-r0 apk +curl 8.8.0-r0 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -118,8 +118,8 @@ libblkid 2.40.1-r1 apk libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r0 apk -libcurl 8.7.1-r0 apk +libcrypto3 3.3.1-r1 apk +libcurl 8.8.0-r0 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk @@ -156,7 +156,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.3.1-r0 apk +libssl3 3.3.1-r1 apk libstdc++ 13.2.1_git20240309-r0 apk libtheora 1.1.1-r18 apk libunibreak 6.1-r0 apk @@ -189,7 +189,7 @@ musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk ncurses-terminfo-base 6.4_p20240420-r0 apk netcat-openbsd 1.226-r0 apk -nghttp2-libs 1.62.0-r0 apk +nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk numpy 2.0.0 python oauthlib 3.2.2 python @@ -201,7 +201,7 @@ openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk orc 0.4.37-r0 apk pcre2 10.43-r0 apk -pillow 10.3.0 python +pillow 10.4.0 python pip 24.1.1 python platformdirs 4.2.0 python procps-ng 4.0.4-r0 apk @@ -238,7 +238,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 70.1.1 python +setuptools 70.2.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From f8747eda8314d4ecafc8dff7a9579e84587452ad Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Tue, 2 Jul 2024 19:34:24 +0100 Subject: [PATCH 455/525] Fix casing --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- readme-vars.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2286e53..abde698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/unrar:latest as unrar +FROM ghcr.io/linuxserver/unrar:latest AS unrar FROM ghcr.io/linuxserver/baseimage-alpine:3.20 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0965cdd..9c05605 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar +FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 diff --git a/readme-vars.yml b/readme-vars.yml index 449725e..ab6190a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,6 +19,9 @@ param_volumes: param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} + +readonly_supported: true + # application setup block app_setup_block_enabled: true app_setup_block: | From eb2d478e47abf0c8d9c5d749d33fba1741e8dce7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 5 Jul 2024 06:36:56 +0000 Subject: [PATCH 456/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8cd5e7b..c619253 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ itsdangerous 2.1.2 python jq 1.7.1-r0 apk json-tricks 3.17.3 python jsonschema 4.17.3 python -knowit 0.5.2 python +knowit 0.5.3 python lame-libs 3.100-r5 apk lcms2 2.16-r0 apk libSvtAv1Enc 2.0.0-r1 apk From 1990a5e0af44ca67d4f1729d68964723fc291b72 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 Jul 2024 06:37:08 +0000 Subject: [PATCH 457/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c619253..3cc2427 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -202,7 +202,7 @@ opus 1.5.2-r0 apk orc 0.4.37-r0 apk pcre2 10.43-r0 apk pillow 10.4.0 python -pip 24.1.1 python +pip 24.1.2 python platformdirs 4.2.0 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python From 34f78e53d209d551a1c79006161fb050efc2766d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jul 2024 21:26:02 +0000 Subject: [PATCH 458/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3cc2427..1c2145e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -238,7 +238,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 70.2.0 python +setuptools 70.3.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 94ad1d17dd65482c0552c8edc0cf0a056efdea8a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 10 Jul 2024 06:35:59 +0000 Subject: [PATCH 459/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1c2145e..d86007f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -66,7 +66,7 @@ dogpile.cache 1.3.2 python dynaconf 3.2.4 python enzyme 0.4.1 python fcache 0.5.2 python -fese 0.2.9 python +fese 0.3.0 python ffmpeg 6.1.1-r8 apk ffmpeg-libavcodec 6.1.1-r8 apk ffmpeg-libavdevice 6.1.1-r8 apk From dee50e3fa1400070a2ab4c6c15284122213477cc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 12 Jul 2024 06:38:02 +0000 Subject: [PATCH 460/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d86007f..df71783 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -118,7 +118,7 @@ libblkid 2.40.1-r1 apk libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r1 apk +libcrypto3 3.3.1-r3 apk libcurl 8.8.0-r0 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk @@ -156,7 +156,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.3.1-r1 apk +libssl3 3.3.1-r3 apk libstdc++ 13.2.1_git20240309-r0 apk libtheora 1.1.1-r18 apk libunibreak 6.1-r0 apk From 04a8c9c9178e1b4ea9ace91d30ad92ebc0483f11 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jul 2024 06:36:38 +0000 Subject: [PATCH 461/525] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 476fbc9..56e81a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,7 +255,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -362,7 +362,7 @@ pipeline { fi echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ cd ${TEMPDIR}/docs/docker-documentation @@ -380,8 +380,8 @@ pipeline { echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then @@ -713,7 +713,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -804,7 +804,7 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 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 From 735fa56746d3e5016f9ad87622dbc4b62562edff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jul 2024 06:38:04 +0000 Subject: [PATCH 462/525] Bot Updating Templated Files --- .github/workflows/permissions.yml | 2 ++ README.md | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc5..02e1bdb 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -5,6 +5,8 @@ on: - '**/run' - '**/finish' - '**/check' + - 'root/migrations/*' + jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/README.md b/README.md index 4989318..6d27273 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,11 @@ The architectures supported by this image are: - Once running the URL will be `http://<host-ip>:6767`. - You must complete all the setup parameters in the webui before you can save the config. +## Read-Only Operation + +This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). + + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -110,6 +115,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PGID=1000` | for GroupID - see below for explanation | | `-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` | Persistent config files | +| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | ## Environment variables from files (Docker secrets) From ef6f97caac2e9e9e77e58436f74aedc8779ea59e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jul 2024 06:41:20 +0000 Subject: [PATCH 463/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index df71783..dfa9d37 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,8 +42,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.36.1-r29 apk busybox-binsh 1.36.1-r29 apk c-ares 1.28.1-r0 apk -ca-certificates 20240226-r0 apk -ca-certificates-bundle 20240226-r0 apk +ca-certificates 20240705-r0 apk +ca-certificates-bundle 20240705-r0 apk catatonit 0.2.0-r0 apk certifi 2024.2.2 python chardet 5.2.0 python From 517c9a91e304825baf9e4b849cbefb837b97c54c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jul 2024 21:27:56 +0000 Subject: [PATCH 464/525] Bot Updating Package Versions --- package_versions.txt | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dfa9d37..dc31c37 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,8 +31,10 @@ apprise 1.7.6 python argparse 1.4.0 python attrs 23.2.0 python auditok 0.1.5 python +autocommand 2.2.2 python babelfish 0.6.0 python backports.functools_lru_cache 2.0.0 python +backports.tarfile 1.2.0 python backports.zoneinfo 0.2.1 python bash 5.2.26-r0 apk beautifulsoup4 4.12.3 python @@ -100,9 +102,15 @@ hwdata-pci 0.382-r0 apk idna 3.6 python imath 3.1.11-r2 apk importlib_metadata 7.0.1 python +importlib_metadata 8.0.0 python importlib_resources 6.1.2 python +importlib_resources 6.4.0 python inflect 7.0.0 python +inflect 7.3.1 python itsdangerous 2.1.2 python +jaraco.context 5.3.0 python +jaraco.functools 4.0.1 python +jaraco.text 3.12.1 python jq 1.7.1-r0 apk json-tricks 3.17.3 python jsonschema 4.17.3 python @@ -182,16 +190,18 @@ linux-pam 1.6.0-r0 apk lxml 4.9.4 python mbedtls 3.6.0-r0 apk mediainfo 24.04-r0 apk +more-itertools 10.3.0 python mpdecimal 4.0.0-r0 apk mpg123-libs 1.32.6-r0 apk msgpack 1.0.7 python musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk +my-test-package 1.0 python ncurses-terminfo-base 6.4_p20240420-r0 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.0.0 python +numpy 2.0.1 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -200,10 +210,13 @@ openexr-libilmthread 3.1.13-r1 apk openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk orc 0.4.37-r0 apk +ordered-set 4.1.0 python +packaging 24.1 python pcre2 10.43-r0 apk pillow 10.4.0 python pip 24.1.2 python platformdirs 4.2.0 python +platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python pyc 3.12.3-r1 apk @@ -238,7 +251,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 70.3.0 python +setuptools 71.1.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -259,9 +272,12 @@ tdb-libs 1.4.9-r1 apk textdistance 4.6.2 python tinyxml2 10.0.0-r0 apk tld 0.13 python +tomli 2.0.1 python tqdm 4.66.2 python trakit 0.2.1 python +typeguard 4.3.0 python typing_extensions 4.10.0 python +typing_extensions 4.12.2 python tzdata 2024.1 python tzdata 2024a-r1 apk tzlocal 5.2 python @@ -276,7 +292,7 @@ wcwidth 0.2.13 python webencodings 0.5.1 python webrtcvad-wheels 2.0.11.post1 python websocket-client 1.7.0 python -wheel 0.43.0 python +wheel 0.43.0 python (+1 duplicate) whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164_git20231001-r0 apk @@ -285,6 +301,7 @@ xvidcore 1.3.7-r2 apk xz-libs 5.6.1-r3 apk zimg 3.0.5-r2 apk zipp 3.17.0 python +zipp 3.19.2 python zix-libs 0.4.2-r0 apk zlib 1.3.1-r1 apk zstd-libs 1.5.6-r0 apk From f0a66a96c064d8eea63b52fb40ff36a55a2bfcce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 Jul 2024 21:23:35 +0000 Subject: [PATCH 465/525] Bot Updating Package Versions --- package_versions.txt | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dc31c37..02ecd25 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,41 +1,25 @@ NAME VERSION TYPE -APScheduler 3.10.4 python -Flask 3.0.2 python -Flask-Cors 4.0.0 python -Flask-Migrate 4.0.5 python -Flask-SQLAlchemy 3.1.1 python -Flask-SocketIO 5.3.6 python -Jinja2 3.1.3 python -Js2Py 0.74 python -Mako 1.3.2 python -Markdown 3.5.2 python -MarkupSafe 2.1.5 python -PySocks 1.7.1 python -PyYAML 6.0.1 python -Pygments 2.17.2 python -SQLAlchemy 2.0.27 python Simple Launcher 1.1.0.14 dotnet (+5 duplicates) -Unidecode 1.3.8 python -Werkzeug 3.0.1 python alembic 1.13.1 python alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.1-r0 apk +alpine-release 3.20.2-r0 apk alsa-lib 1.2.11-r0 apk aniso8601 9.0.1 python aom-libs 3.9.0-r0 apk apk-tools 2.14.4-r0 apk appdirs 1.4.4 python apprise 1.7.6 python +apscheduler 3.10.4 python argparse 1.4.0 python attrs 23.2.0 python auditok 0.1.5 python autocommand 2.2.2 python babelfish 0.6.0 python -backports.functools_lru_cache 2.0.0 python -backports.tarfile 1.2.0 python -backports.zoneinfo 0.2.1 python +backports-functools-lru-cache 2.0.0 python +backports-tarfile 1.2.0 python +backports-zoneinfo 0.2.1 python bash 5.2.26-r0 apk beautifulsoup4 4.12.3 python bidict 0.23.1 python @@ -59,12 +43,12 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.8.0-r0 apk +curl 8.9.0-r0 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python dnspython 2.6.1 python -dogpile.cache 1.3.2 python +dogpile-cache 1.3.2 python dynaconf 3.2.4 python enzyme 0.4.1 python fcache 0.5.2 python @@ -81,7 +65,12 @@ ffmpeg-libswscale 6.1.1-r8 apk ffmpeg-python 0.2.0 python ffsubsync 0.4.25 python findutils 4.9.0-r5 apk +flask 3.0.2 python +flask-cors 4.0.0 python +flask-migrate 4.0.5 python flask-restx 1.3.0 python +flask-socketio 5.3.6 python +flask-sqlalchemy 3.1.1 python fontconfig 2.15.0-r1 apk freetype 2.13.2-r0 apk fribidi 1.0.15-r0 apk @@ -101,17 +90,19 @@ html5lib 1.1 python hwdata-pci 0.382-r0 apk idna 3.6 python imath 3.1.11-r2 apk -importlib_metadata 7.0.1 python -importlib_metadata 8.0.0 python -importlib_resources 6.1.2 python -importlib_resources 6.4.0 python +importlib-metadata 7.0.1 python +importlib-metadata 8.0.0 python +importlib-resources 6.1.2 python +importlib-resources 6.4.0 python inflect 7.0.0 python inflect 7.3.1 python itsdangerous 2.1.2 python -jaraco.context 5.3.0 python -jaraco.functools 4.0.1 python -jaraco.text 3.12.1 python +jaraco-context 5.3.0 python +jaraco-functools 4.0.1 python +jaraco-text 3.12.1 python +jinja2 3.1.3 python jq 1.7.1-r0 apk +js2py 0.74 python json-tricks 3.17.3 python jsonschema 4.17.3 python knowit 0.5.3 python @@ -127,7 +118,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.1-r3 apk -libcurl 8.8.0-r0 apk +libcurl 8.9.0-r0 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk @@ -188,6 +179,9 @@ libzmq 4.3.5-r2 apk lilv-libs 0.24.24-r1 apk linux-pam 1.6.0-r0 apk lxml 4.9.4 python +mako 1.3.2 python +markdown 3.5.2 python +markupsafe 2.1.5 python mbedtls 3.6.0-r0 apk mediainfo 24.04-r0 apk more-itertools 10.3.0 python @@ -214,7 +208,7 @@ ordered-set 4.1.0 python packaging 24.1 python pcre2 10.43-r0 apk pillow 10.4.0 python -pip 24.1.2 python +pip 24.2 python platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk @@ -222,10 +216,12 @@ psycopg2-binary 2.9.9 python pyc 3.12.3-r1 apk pycountry 23.12.11 python pydantic 1.10.14 python +pygments 2.17.2 python pyjsparser 2.7.1 python pymediainfo 6.1.0 python pyparsing 3.1.1 python pyrsistent 0.20.0 python +pysocks 1.7.1 python pysrt 1.1.2 python pysubs2 1.7.2 python python-anticaptcha 1.0.0 python @@ -236,7 +232,8 @@ python3 3.12.3-r1 apk python3-pyc 3.12.3-r1 apk python3-pycache-pyc0 3.12.3-r1 apk pytz 2024.1 python -pytz_deprecation_shim 0.1.0.post0 python +pytz-deprecation-shim 0.1.0.post0 python +pyyaml 6.0.1 python rarfile 4.1 python rav1e-libs 0.7.1-r0 apk readline 8.2.10-r0 apk @@ -251,7 +248,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 71.1.0 python +setuptools 72.1.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -263,6 +260,7 @@ soupsieve 2.3.2.post1 python soxr 0.1.3-r7 apk speexdsp 1.2.1-r2 apk spirv-tools 1.3.261.1-r0 apk +sqlalchemy 2.0.27 python sqlite-libs 3.45.3-r1 apk sratom 0.6.16-r0 apk srt 3.5.3 python @@ -276,11 +274,12 @@ tomli 2.0.1 python tqdm 4.66.2 python trakit 0.2.1 python typeguard 4.3.0 python -typing_extensions 4.10.0 python -typing_extensions 4.12.2 python +typing-extensions 4.10.0 python +typing-extensions 4.12.2 python tzdata 2024.1 python tzdata 2024a-r1 apk tzlocal 5.2 python +unidecode 1.3.8 python urllib3 2.2.1 python utmps-libs 0.1.2.2-r1 apk v4l-utils-libs 1.24.1-r1 apk @@ -292,6 +291,7 @@ wcwidth 0.2.13 python webencodings 0.5.1 python webrtcvad-wheels 2.0.11.post1 python websocket-client 1.7.0 python +werkzeug 3.0.1 python wheel 0.43.0 python (+1 duplicate) whichcraft 0.6.1 python wsproto 1.2.0 python From a83c80f33039431536454d5a2abe293345623c54 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Aug 2024 06:37:29 +0000 Subject: [PATCH 466/525] Bot Updating Package Versions --- package_versions.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 02ecd25..1a71b29 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ alpine-keys 2.4-r1 apk alpine-release 3.20.2-r0 apk alsa-lib 1.2.11-r0 apk aniso8601 9.0.1 python -aom-libs 3.9.0-r0 apk +aom-libs 3.9.1-r0 apk apk-tools 2.14.4-r0 apk appdirs 1.4.4 python apprise 1.7.6 python @@ -292,7 +292,8 @@ webencodings 0.5.1 python webrtcvad-wheels 2.0.11.post1 python websocket-client 1.7.0 python werkzeug 3.0.1 python -wheel 0.43.0 python (+1 duplicate) +wheel 0.43.0 python +wheel 0.44.0 python whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164_git20231001-r0 apk From e80d1242adbeafcaeaf830f866118d8c9972d0cc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Aug 2024 06:37:38 +0000 Subject: [PATCH 467/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1a71b29..9528bf3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -299,7 +299,7 @@ wsproto 1.2.0 python x264-libs 0.164_git20231001-r0 apk x265-libs 3.6-r0 apk xvidcore 1.3.7-r2 apk -xz-libs 5.6.1-r3 apk +xz-libs 5.6.2-r0 apk zimg 3.0.5-r2 apk zipp 3.17.0 python zipp 3.19.2 python From 0779a46829129a375500d8ad47a733828b036501 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Aug 2024 21:26:19 +0000 Subject: [PATCH 468/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9528bf3..dcdf81f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -248,7 +248,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 72.1.0 python +setuptools 72.2.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 6c8c6d055d357ee059827ac9153e79026199317f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 06:35:33 +0000 Subject: [PATCH 469/525] Bot Updating Templated Files --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 56e81a6..ff40dff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,8 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') + QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') + GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') EXT_GIT_BRANCH = 'development' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -39,9 +41,23 @@ pipeline { CI_WEBPATH='/system/status' } stages { + stage("Set git config"){ + steps{ + sh '''#!/bin/bash + cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign + chmod 600 /config/.ssh/id_sign + ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub + echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits" + git config --global gpg.format ssh + git config --global user.signingkey /config/.ssh/id_sign + git config --global commit.gpgsign true + ''' + } + } // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then @@ -391,9 +407,9 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then echo "Image is on the ignore list, and already in the deprecation folder." - elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, marking Unraid template as deprecated" cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add -u unraid/${CONTAINER_NAME}.xml @@ -486,10 +502,10 @@ pipeline { } } /* ####################### - GitLab Mirroring + GitLab Mirroring and Quay.io Repo Visibility ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint - stage("GitLab Mirror"){ + // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public + stage("GitLab Mirror and Quay.io Visibility"){ when { environment name: 'EXIT_STATUS', value: '' } @@ -505,6 +521,8 @@ pipeline { "visibility":"public"}' ''' sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' + sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \ + -d '{"visibility":"public"}' ||: ''' } } /* ############### @@ -599,7 +617,7 @@ pipeline { --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { + retry_backoff(5,5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } sh '''#! /bin/bash @@ -755,7 +773,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -773,7 +791,7 @@ pipeline { docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} + docker push ${PUSHIMAGE}:${SEMVER} fi done ''' @@ -796,7 +814,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -859,7 +877,7 @@ pipeline { "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\ "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json @@ -991,6 +1009,13 @@ EOF ###################### */ post { always { + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' script{ if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' @@ -1020,3 +1045,20 @@ EOF } } } + +def retry_backoff(int max_attempts, int power_base, Closure c) { + int n = 0 + while (n < max_attempts) { + try { + c() + return + } catch (err) { + if ((n + 1) >= max_attempts) { + throw err + } + sleep(power_base ** n) + n++ + } + } + return +} From 5602ff35fbf4d9e9f83ccb1513a1f276b57435d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 06:37:44 +0000 Subject: [PATCH 470/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 45 +++++++++---------- .../workflows/external_trigger_scheduler.yml | 24 +++++----- .github/workflows/package_trigger.yml | 22 ++++----- .../workflows/package_trigger_scheduler.yml | 18 ++++---- 4 files changed, 54 insertions(+), 55 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 714171a..ce14fdf 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -12,17 +12,20 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/development' run: | + printf "# External trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then - echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" - echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\". ****" - echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving external version ****" + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY + printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases" | jq -r '.[0] | .tag_name') + echo "Type is \`github_devel\`" >> $GITHUB_STEP_SUMMARY if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then - echo "**** Can't retrieve external version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve external version for bazarr branch development" GHA_TRIGGER_URL="https://github.com/linuxserver/docker-bazarr/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, @@ -31,9 +34,8 @@ jobs: exit 1 fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "**** External version: ${EXT_RELEASE} ****" - echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving last pushed version ****" + echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/bazarr" tag="development" token=$(curl -sX GET \ @@ -60,37 +62,34 @@ jobs: IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then - echo "**** Can't retrieve last pushed version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve last pushed version for bazarr tag development" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - echo "**** Last pushed version: ${IMAGE_VERSION} ****" - echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY + echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" - echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY + echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" - echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" - echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY + printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index f91a373..c4452e0 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -15,31 +15,31 @@ jobs: - name: External Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# External trigger scheduler for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml) ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then - echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" + echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." - echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ -d "{\"ref\":\"refs/heads/${br}\"}" \ https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/external_trigger.yml/dispatches else - echo "**** Workflow doesn't exist; skipping trigger. ****" - echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" - echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 91a9912..fc8dd56 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -12,29 +12,29 @@ jobs: - name: Package Trigger if: github.ref == 'refs/heads/development' run: | + printf "# Package trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" - echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** Package trigger running off of development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\". ****" - echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 127e446..8970732 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -15,17 +15,19 @@ jobs: - name: Package Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# Package trigger scheduler for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ @@ -35,11 +37,9 @@ jobs: https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/package_trigger.yml/dispatches sleep 30 else - echo "**** Workflow doesn't exist; skipping trigger. ****" echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done From e6cfe4a7411d81042a78986688b99f430c16f9b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 06:41:58 +0000 Subject: [PATCH 471/525] Bot Updating Package Versions --- package_versions.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dcdf81f..0bdd575 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -195,7 +195,7 @@ ncurses-terminfo-base 6.4_p20240420-r0 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.0.1 python +numpy 2.1.0 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -204,7 +204,6 @@ openexr-libilmthread 3.1.13-r1 apk openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk orc 0.4.37-r0 apk -ordered-set 4.1.0 python packaging 24.1 python pcre2 10.43-r0 apk pillow 10.4.0 python @@ -248,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 72.2.0 python +setuptools 73.0.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From e57030745c9964b9c68d3eb41842d4d8a618dc2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 21:25:07 +0000 Subject: [PATCH 472/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0bdd575..e613e96 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 73.0.0 python +setuptools 73.0.1 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 0cefda4f714f83c9d673a6e646261e2b53d9c744 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 25 Aug 2024 06:36:00 +0000 Subject: [PATCH 473/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e613e96..1f7ac48 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -212,7 +212,7 @@ platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python -pyc 3.12.3-r1 apk +pyc 3.12.3-r2 apk pycountry 23.12.11 python pydantic 1.10.14 python pygments 2.17.2 python @@ -227,9 +227,9 @@ python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python python-socketio 5.11.1 python -python3 3.12.3-r1 apk -python3-pyc 3.12.3-r1 apk -python3-pycache-pyc0 3.12.3-r1 apk +python3 3.12.3-r2 apk +python3-pyc 3.12.3-r2 apk +python3-pycache-pyc0 3.12.3-r2 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python From e4c6f833c2aa7bf79941524ee4c39b07f857a0fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Aug 2024 21:24:43 +0000 Subject: [PATCH 474/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1f7ac48..ac8db74 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 73.0.1 python +setuptools 74.0.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From f587b7c99637806a84d5b35e6c06c860806f7f0b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Sep 2024 06:39:32 +0000 Subject: [PATCH 475/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ac8db74..dc2cbb1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.0-r0 apk +curl 8.9.1-r1 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -118,7 +118,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.1-r3 apk -libcurl 8.9.0-r0 apk +libcurl 8.9.1-r1 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk @@ -182,7 +182,7 @@ lxml 4.9.4 python mako 1.3.2 python markdown 3.5.2 python markupsafe 2.1.5 python -mbedtls 3.6.0-r0 apk +mbedtls 3.6.1-r0 apk mediainfo 24.04-r0 apk more-itertools 10.3.0 python mpdecimal 4.0.0-r0 apk From fe6a7e05ac140e58103320f893ffff586105d201 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Sep 2024 06:37:47 +0000 Subject: [PATCH 476/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dc2cbb1..582a381 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 74.0.0 python +setuptools 74.1.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -288,7 +288,7 @@ waitress 3.0.0 python wayland-libs-client 1.22.0-r4 apk wcwidth 0.2.13 python webencodings 0.5.1 python -webrtcvad-wheels 2.0.11.post1 python +webrtcvad-wheels 2.0.12 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python From b5d3919df29e0278b6d64d8518762d6ff19b6dab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Sep 2024 21:25:47 +0000 Subject: [PATCH 477/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 582a381..cc0d005 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -195,7 +195,7 @@ ncurses-terminfo-base 6.4_p20240420-r0 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.1.0 python +numpy 2.1.1 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 74.1.0 python +setuptools 74.1.1 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From d2a61a4198518316e4147ecacc880d456f586158 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 4 Sep 2024 06:39:17 +0000 Subject: [PATCH 478/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cc0d005..3b3d537 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -117,7 +117,7 @@ libblkid 2.40.1-r1 apk libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r3 apk +libcrypto3 3.3.2-r0 apk libcurl 8.9.1-r1 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk @@ -155,7 +155,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.3.1-r3 apk +libssl3 3.3.2-r0 apk libstdc++ 13.2.1_git20240309-r0 apk libtheora 1.1.1-r18 apk libunibreak 6.1-r0 apk From bde294eb3dad75d16c88d8f2771ac14353dadb37 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 5 Sep 2024 06:38:11 +0000 Subject: [PATCH 479/525] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3b3d537..cd9f4b4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -123,7 +123,7 @@ libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk libeconf 0.6.3-r0 apk -libexpat 2.6.2-r0 apk +libexpat 2.6.3-r0 apk libffi 3.4.6-r0 apk libflac 1.4.3-r1 apk libgcc 13.2.1_git20240309-r0 apk @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 74.1.1 python +setuptools 74.1.2 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -288,7 +288,7 @@ waitress 3.0.0 python wayland-libs-client 1.22.0-r4 apk wcwidth 0.2.13 python webencodings 0.5.1 python -webrtcvad-wheels 2.0.12 python +webrtcvad-wheels 2.0.13 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python From 772e9df838820688b544fca2d075bdfbf464dc6f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Sep 2024 06:42:49 +0000 Subject: [PATCH 480/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cd9f4b4..4290e8f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alembic 1.13.1 python alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.2-r0 apk +alpine-release 3.20.3-r0 apk alsa-lib 1.2.11-r0 apk aniso8601 9.0.1 python aom-libs 3.9.1-r0 apk @@ -79,7 +79,7 @@ future 1.0.0 python ga4mp 2.0.4 python gdbm 1.23-r1 apk giflib 5.2.2-r0 apk -glib 2.80.2-r0 apk +glib 2.80.4-r0 apk glslang-libs 1.3.261.1-r0 apk graphite2 1.3.14-r6 apk guess-language-spirit 0.5.3 python @@ -276,7 +276,7 @@ typeguard 4.3.0 python typing-extensions 4.10.0 python typing-extensions 4.12.2 python tzdata 2024.1 python -tzdata 2024a-r1 apk +tzdata 2024b-r0 apk tzlocal 5.2 python unidecode 1.3.8 python urllib3 2.2.1 python @@ -288,7 +288,7 @@ waitress 3.0.0 python wayland-libs-client 1.22.0-r4 apk wcwidth 0.2.13 python webencodings 0.5.1 python -webrtcvad-wheels 2.0.13 python +webrtcvad-wheels 2.0.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python From 1900b98260e9eb996a87c5bf36bac920cf6a7676 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Sep 2024 06:39:05 +0000 Subject: [PATCH 481/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4290e8f..5d69a06 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -203,7 +203,7 @@ openexr-libiex 3.1.13-r1 apk openexr-libilmthread 3.1.13-r1 apk openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk -orc 0.4.37-r0 apk +orc 0.4.39-r0 apk packaging 24.1 python pcre2 10.43-r0 apk pillow 10.4.0 python From 376206b98a7147cdea91e2135ff01239337ccab4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Sep 2024 21:26:04 +0000 Subject: [PATCH 482/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5d69a06..393132e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -89,7 +89,7 @@ harfbuzz 8.5.0-r0 apk html5lib 1.1 python hwdata-pci 0.382-r0 apk idna 3.6 python -imath 3.1.11-r2 apk +imath 3.1.12-r0 apk importlib-metadata 7.0.1 python importlib-metadata 8.0.0 python importlib-resources 6.1.2 python From 028763dd02130e08ab3facefd42b82c4d5f1d0e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 13 Sep 2024 06:38:23 +0000 Subject: [PATCH 483/525] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 393132e..9fc7aa9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,10 +139,10 @@ libltdl 2.4.7-r3 apk libmd 1.1.0-r0 apk libmediainfo 24.04-r0 apk libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r0 apk +libncursesw 6.4_p20240420-r1 apk libogg 1.3.5-r5 apk libopenmpt 0.7.7-r0 apk -libpanelw 6.4_p20240420-r0 apk +libpanelw 6.4_p20240420-r1 apk libpciaccess 0.18.1-r0 apk libplacebo 6.338.2-r1 apk libpng 1.6.43-r0 apk @@ -191,7 +191,7 @@ msgpack 1.0.7 python musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk my-test-package 1.0 python -ncurses-terminfo-base 6.4_p20240420-r0 apk +ncurses-terminfo-base 6.4_p20240420-r1 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk @@ -212,7 +212,7 @@ platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python -pyc 3.12.3-r2 apk +pyc 3.12.6-r0 apk pycountry 23.12.11 python pydantic 1.10.14 python pygments 2.17.2 python @@ -227,9 +227,9 @@ python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python python-socketio 5.11.1 python -python3 3.12.3-r2 apk -python3-pyc 3.12.3-r2 apk -python3-pycache-pyc0 3.12.3-r2 apk +python3 3.12.6-r0 apk +python3-pyc 3.12.6-r0 apk +python3-pycache-pyc0 3.12.6-r0 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python From ee746c2b425c0e74eab8c264d883540627f2bb67 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 15 Sep 2024 20:31:40 +0000 Subject: [PATCH 484/525] Bot Updating Package Versions --- package_versions.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9fc7aa9..fe7edfd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.1-r1 apk +curl 8.10.0-r0 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -97,6 +97,7 @@ importlib-resources 6.4.0 python inflect 7.0.0 python inflect 7.3.1 python itsdangerous 2.1.2 python +jaraco-collections 5.1.0 python jaraco-context 5.3.0 python jaraco-functools 4.0.1 python jaraco-text 3.12.1 python @@ -118,7 +119,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r0 apk -libcurl 8.9.1-r1 apk +libcurl 8.10.0-r0 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk @@ -247,7 +248,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 74.1.2 python +setuptools 75.0.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 3f3abd34180fc02bd33b42749ab95a42676d09b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Sep 2024 06:34:38 +0000 Subject: [PATCH 485/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fe7edfd..0d542ec 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -248,7 +248,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.0.0 python +setuptools 75.1.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From d05f74a0deaf94988ffbdae68a1e17c5acb60682 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Sep 2024 21:25:23 +0000 Subject: [PATCH 486/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0d542ec..01d2ad2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -146,7 +146,7 @@ libopenmpt 0.7.7-r0 apk libpanelw 6.4_p20240420-r1 apk libpciaccess 0.18.1-r0 apk libplacebo 6.338.2-r1 apk -libpng 1.6.43-r0 apk +libpng 1.6.44-r0 apk libproc2 4.0.4-r0 apk libpsl 0.21.5-r1 apk libpulse 17.0-r0 apk From 1a8a879b0a9b56523391120b304b87ad794f3470 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 21 Sep 2024 06:38:04 +0000 Subject: [PATCH 487/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 01d2ad2..2828732 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ future 1.0.0 python ga4mp 2.0.4 python gdbm 1.23-r1 apk giflib 5.2.2-r0 apk -glib 2.80.4-r0 apk +glib 2.80.5-r0 apk glslang-libs 1.3.261.1-r0 apk graphite2 1.3.14-r6 apk guess-language-spirit 0.5.3 python From 6f96ba98dcd8facc77db2ba79242e3b76c41d4da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Sep 2024 06:41:12 +0000 Subject: [PATCH 488/525] Bot Updating Package Versions --- package_versions.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2828732..0e4c669 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,6 @@ apk-tools 2.14.4-r0 apk appdirs 1.4.4 python apprise 1.7.6 python apscheduler 3.10.4 python -argparse 1.4.0 python attrs 23.2.0 python auditok 0.1.5 python autocommand 2.2.2 python @@ -43,7 +42,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.10.0-r0 apk +curl 8.9.1-r2 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -119,7 +118,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r0 apk -libcurl 8.10.0-r0 apk +libcurl 8.9.1-r2 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk From 84e9739a0c1b5bfbdffe0678ae4d1d5391931a22 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 27 Sep 2024 06:40:01 +0000 Subject: [PATCH 489/525] Bot Updating Templated Files --- Jenkinsfile | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff40dff..98b846b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt' + 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./root/donate.txt' } sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' @@ -321,7 +321,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting 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 .github/workflows/package_trigger.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -729,6 +729,14 @@ pipeline { } sh '''#! /bin/bash set -e + if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then + echo "Detected baseimage, setting LSIO_FIRST_PARTY=true" + if [ -n "${CI_DOCKERENV}" ]; then + CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}" + else + CI_DOCKERENV="LSIO_FIRST_PARTY=true" + fi + fi docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 @@ -741,6 +749,7 @@ pipeline { -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ + -e RELEASE_TAG=\"development\" \ -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ @@ -750,6 +759,7 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e NODE_NAME=\"${NODE_NAME}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -1017,18 +1027,57 @@ EOF git config --global --unset commit.gpgsign ''' script{ + env.JOB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - 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,\ + if (env.GITHUBIMAGE =~ /lspipepr/){ + 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": 3957028,\ + "footer": {"text" : "PR Build"},\ + "timestamp": "'${JOB_DATE}'",\ "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 if (env.GITHUBIMAGE =~ /lsiodev/){ + 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": 3957028,\ + "footer": {"text" : "Dev Build"},\ + "timestamp": "'${JOB_DATE}'",\ + "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://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ + "footer": {"text" : "Live Build"},\ + "timestamp": "'${JOB_DATE}'",\ + "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 { + if (env.GITHUBIMAGE =~ /lspipepr/){ + 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": 12669523,\ + "footer": {"text" : "PR Build"},\ + "timestamp": "'${JOB_DATE}'",\ + "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 if (env.GITHUBIMAGE =~ /lsiodev/){ + 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": 12669523,\ + "footer": {"text" : "Dev Build"},\ + "timestamp": "'${JOB_DATE}'",\ + "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://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ + "footer": {"text" : "Live Build"},\ + "timestamp": "'${JOB_DATE}'",\ "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} ''' + } } } } From 60f6083fa5e0374e7ed774f3146b58f3eb9cc229 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 27 Sep 2024 06:41:45 +0000 Subject: [PATCH 490/525] Bot Updating Templated Files --- .github/workflows/package_trigger.yml | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100755 .github/workflows/package_trigger.yml diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml deleted file mode 100755 index fc8dd56..0000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-development: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Package Trigger - if: github.ref == 'refs/heads/development' - run: | - printf "# Package trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY - exit 0 - fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY - exit 0 - fi - echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" From 305fe0189c52af14b7b5fdb2dbb9a1cc05b50038 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 27 Sep 2024 06:43:25 +0000 Subject: [PATCH 491/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 64 +++++++++++------- .../workflows/package_trigger_scheduler.yml | 66 ++++++++++++++----- README.md | 6 +- 3 files changed, 91 insertions(+), 45 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index ce14fdf..276f517 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -11,15 +11,17 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/development' + env: + SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT }}" ]; then + if grep -wq "^bazarr_development$" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bazarr_development\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of development branch. To disable this trigger, add \`bazarr_development\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases" | jq -r '.[0] | .tag_name') echo "Type is \`github_devel\`" >> $GITHUB_STEP_SUMMARY @@ -78,26 +80,38 @@ jobs: echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY - echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=false \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" - echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for bazarr tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ "${artifacts_found}" == "false" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY + FAILURE_REASON="New version ${EXT_RELEASE} for bazarr tag development is detected, however not all artifacts are uploaded to upstream release yet. Will try again later." + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + else + printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY + if "${artifacts_found}" == "true" ]]; then + echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY + fi + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for bazarr tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi fi diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 8970732..9b67ad6 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -14,6 +14,8 @@ jobs: fetch-depth: '0' - name: Package Trigger Scheduler + env: + SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }} run: | printf "# Package trigger scheduler for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY @@ -24,27 +26,57 @@ jobs: continue fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml | yq -r '.ls_branch') - if [ "${br}" == "${ls_branch}" ]; then + JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml) + if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY - triggered_branches="${triggered_branches}${br} " - curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-bazarr/actions/workflows/package_trigger.yml/dispatches - sleep 30 + if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif grep -wq "^bazarr_${br}$" <<< "${SKIP_PACKAGE_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`bazarr_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " else - echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY + printf "> To disable, add \`bazarr_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY + triggered_branches="${triggered_branches}${br} " + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + sleep 20 fi else echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" - echo "**** Notifying Discord ****" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for bazarr** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bazarr/activity/"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then + if [[ -n "${triggered_branches}" ]]; then + NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + fi + if [[ -n "${skipped_branches}" ]]; then + NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" + fi + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for bazarr** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bazarr/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/README.md b/README.md index 6d27273..16a8f1e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bazarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bazarr) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bazarr%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/development/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbazarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bazarr/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbazarr%2Fdevelopment%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bazarr/development/index.html) [Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you. @@ -66,7 +66,6 @@ The architectures supported by this image are: This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). - ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -253,7 +252,8 @@ Below are the instructions for updating containers: ### Image Update Notifications - Diun (Docker Image Update Notifier) -**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +>[!TIP] +>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 69bcc65576a56b40064ed20727d87e60fd30a877 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 06:40:30 +0000 Subject: [PATCH 492/525] Bot Updating Templated Files --- Jenkinsfile | 75 +++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 43 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 98b846b..83e9d56 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1032,52 +1032,41 @@ EOF returnStdout: true).trim() if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' - } - else if (currentBuild.currentResult == "SUCCESS"){ - if (env.GITHUBIMAGE =~ /lspipepr/){ - 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": 3957028,\ - "footer": {"text" : "PR Build"},\ - "timestamp": "'${JOB_DATE}'",\ - "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{ + if (currentBuild.currentResult == "SUCCESS"){ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=1681177 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + }else{ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=16711680 + env.JOB_WEBHOOK_FOOTER='Live Build' + } } - else if (env.GITHUBIMAGE =~ /lsiodev/){ - 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": 3957028,\ - "footer": {"text" : "Dev Build"},\ + 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'": '${JOB_WEBHOOK_COLOUR}',\ + "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\ "timestamp": "'${JOB_DATE}'",\ - "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"}],\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\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://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ - "footer": {"text" : "Live Build"},\ - "timestamp": "'${JOB_DATE}'",\ - "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 { - if (env.GITHUBIMAGE =~ /lspipepr/){ - 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": 12669523,\ - "footer": {"text" : "PR Build"},\ - "timestamp": "'${JOB_DATE}'",\ - "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 if (env.GITHUBIMAGE =~ /lsiodev/){ - 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": 12669523,\ - "footer": {"text" : "Dev Build"},\ - "timestamp": "'${JOB_DATE}'",\ - "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://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ - "footer": {"text" : "Live Build"},\ - "timestamp": "'${JOB_DATE}'",\ - "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} ''' - } } } } From cc4a711339a94735d24a9a2d871cb591cf7761e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 06:41:53 +0000 Subject: [PATCH 493/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 2 +- .github/workflows/package_trigger_scheduler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 276f517..0e4f13f 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -15,7 +15,7 @@ jobs: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY - if grep -wq "^bazarr_development$" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^bazarr_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bazarr_development\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 9b67ad6..85e693e 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -33,7 +33,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif grep -wq "^bazarr_${br}$" <<< "${SKIP_PACKAGE_TRIGGER}"; then + elif grep -q "^bazarr_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`bazarr_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " From a8d9fd34164c543dc0844a3ac428d7a773a2f22c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 06:45:04 +0000 Subject: [PATCH 494/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0e4c669..1f85f47 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ blinker 1.7.0 python brotli-libs 1.1.0-r2 apk busybox 1.36.1-r29 apk busybox-binsh 1.36.1-r29 apk -c-ares 1.28.1-r0 apk +c-ares 1.33.1-r0 apk ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk catatonit 0.2.0-r0 apk From ac2552670a3f14e43ce61d4fa4eacc729edebbd4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 8 Oct 2024 06:40:56 +0000 Subject: [PATCH 495/525] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1f85f47..c8d6e8b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -195,7 +195,7 @@ ncurses-terminfo-base 6.4_p20240420-r1 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.1.1 python +numpy 2.1.2 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -212,7 +212,7 @@ platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python -pyc 3.12.6-r0 apk +pyc 3.12.7-r0 apk pycountry 23.12.11 python pydantic 1.10.14 python pygments 2.17.2 python @@ -227,9 +227,9 @@ python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python python-socketio 5.11.1 python -python3 3.12.6-r0 apk -python3-pyc 3.12.6-r0 apk -python3-pycache-pyc0 3.12.6-r0 apk +python3 3.12.7-r0 apk +python3-pyc 3.12.7-r0 apk +python3-pycache-pyc0 3.12.7-r0 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python From 3c4fe99643aae8c9744409d291df5a08f1ea1c42 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Oct 2024 21:26:41 +0000 Subject: [PATCH 496/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c8d6e8b..37f8ff1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -206,7 +206,7 @@ opus 1.5.2-r0 apk orc 0.4.39-r0 apk packaging 24.1 python pcre2 10.43-r0 apk -pillow 10.4.0 python +pillow 11.0.0 python pip 24.2 python platformdirs 4.2.0 python platformdirs 4.2.2 python From 882a40bb39a2f907f43927da1fc64199666c000e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 16 Oct 2024 06:41:09 +0000 Subject: [PATCH 497/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 37f8ff1..6f9f50d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -182,7 +182,7 @@ lxml 4.9.4 python mako 1.3.2 python markdown 3.5.2 python markupsafe 2.1.5 python -mbedtls 3.6.1-r0 apk +mbedtls 3.6.2-r0 apk mediainfo 24.04-r0 apk more-itertools 10.3.0 python mpdecimal 4.0.0-r0 apk From 913b741e1d468cd1c723320378e2893df42840e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 17 Oct 2024 06:41:33 +0000 Subject: [PATCH 498/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6f9f50d..e872d0a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -211,7 +211,7 @@ pip 24.2 python platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.9 python +psycopg2-binary 2.9.10 python pyc 3.12.7-r0 apk pycountry 23.12.11 python pydantic 1.10.14 python @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.1.0 python +setuptools 75.2.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 1f3900b1ee7f8fe39dabe4cee37e8bc5e65e2dc4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Oct 2024 06:42:49 +0000 Subject: [PATCH 499/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e872d0a..b29435c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -117,7 +117,7 @@ libblkid 2.40.1-r1 apk libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r0 apk +libcrypto3 3.3.2-r1 apk libcurl 8.9.1-r2 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk @@ -155,7 +155,7 @@ libsndfile 1.2.2-r0 apk libsodium 1.0.19-r0 apk libsrt 1.5.3-r0 apk libssh 0.10.6-r0 apk -libssl3 3.3.2-r0 apk +libssl3 3.3.2-r1 apk libstdc++ 13.2.1_git20240309-r0 apk libtheora 1.1.1-r18 apk libunibreak 6.1-r0 apk From bd6c6032714d23442d90e38dc7d39334d1e6915c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 22 Oct 2024 21:25:31 +0000 Subject: [PATCH 500/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b29435c..e54b16f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -203,7 +203,7 @@ openexr-libiex 3.1.13-r1 apk openexr-libilmthread 3.1.13-r1 apk openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk -orc 0.4.39-r0 apk +orc 0.4.40-r0 apk packaging 24.1 python pcre2 10.43-r0 apk pillow 11.0.0 python From f87fc23a02546bb7e6765f2509f343cfcd240fb3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Oct 2024 06:42:11 +0000 Subject: [PATCH 501/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e54b16f..631c96e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -207,7 +207,7 @@ orc 0.4.40-r0 apk packaging 24.1 python pcre2 10.43-r0 apk pillow 11.0.0 python -pip 24.2 python +pip 24.3.1 python platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk From a12c5bdabeaf9c7a8497a06b068f46dd3786b980 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Oct 2024 06:41:32 +0000 Subject: [PATCH 502/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 631c96e..781b980 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -186,7 +186,7 @@ mbedtls 3.6.2-r0 apk mediainfo 24.04-r0 apk more-itertools 10.3.0 python mpdecimal 4.0.0-r0 apk -mpg123-libs 1.32.6-r0 apk +mpg123-libs 1.32.8-r0 apk msgpack 1.0.7 python musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk From 19ac4534c54fa7d1e76bfb8235428fe4c949b901 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Oct 2024 21:26:52 +0000 Subject: [PATCH 503/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 781b980..649298f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -247,7 +247,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.2.0 python +setuptools 75.3.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 5b5a4be315987518b146d932d30a947cb886fc46 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 5 Nov 2024 21:24:48 +0000 Subject: [PATCH 504/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 649298f..48559c4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -195,7 +195,7 @@ ncurses-terminfo-base 6.4_p20240420-r1 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.1.2 python +numpy 2.1.3 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk From 7a273584d0915d703c9aff5d4a9a184e15260701 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:24:50 +0000 Subject: [PATCH 505/525] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 83e9d56..bd1130f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -894,7 +894,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "development",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From e1a51a7d7b67355ae865d604209b61d4d649e9c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:26:46 +0000 Subject: [PATCH 506/525] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 4 ++-- .github/workflows/package_trigger_scheduler.yml | 5 +++-- README.md | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6500438..d01e6d8 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -105,10 +105,10 @@ docker build \ -t linuxserver/bazarr:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 85e693e..f9d8978 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -70,13 +70,14 @@ jobs: if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then if [[ -n "${triggered_branches}" ]]; then NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bazarr/activity/ \n" + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" fi if [[ -n "${skipped_branches}" ]]; then NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" fi - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" echo "**** Notifying Discord ****" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for bazarr** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bazarr/activity/"' \n"}], + "description": "**Package Check Build(s) for bazarr** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} fi diff --git a/README.md b/README.md index 16a8f1e..e0071c5 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ The architectures supported by this image are: - Once running the URL will be `http://<host-ip>:6767`. - You must complete all the setup parameters in the webui before you can save the config. + ## Read-Only Operation This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). @@ -268,10 +269,10 @@ docker build \ -t lscr.io/linuxserver/bazarr:development . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. From 2f503ee5fcdffcf20cd0f94df7a17e6514529efd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:31:29 +0000 Subject: [PATCH 507/525] Bot Updating Package Versions --- package_versions.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 48559c4..2dd07ab 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -92,7 +92,6 @@ imath 3.1.12-r0 apk importlib-metadata 7.0.1 python importlib-metadata 8.0.0 python importlib-resources 6.1.2 python -importlib-resources 6.4.0 python inflect 7.0.0 python inflect 7.3.1 python itsdangerous 2.1.2 python @@ -123,7 +122,7 @@ libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk libeconf 0.6.3-r0 apk -libexpat 2.6.3-r0 apk +libexpat 2.6.4-r0 apk libffi 3.4.6-r0 apk libflac 1.4.3-r1 apk libgcc 13.2.1_git20240309-r0 apk @@ -204,7 +203,7 @@ openexr-libilmthread 3.1.13-r1 apk openexr-libopenexr 3.1.13-r1 apk opus 1.5.2-r0 apk orc 0.4.40-r0 apk -packaging 24.1 python +packaging 24.2 python pcre2 10.43-r0 apk pillow 11.0.0 python pip 24.3.1 python @@ -247,7 +246,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.3.0 python +setuptools 75.4.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -292,7 +291,7 @@ webrtcvad-wheels 2.0.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python -wheel 0.44.0 python +wheel 0.45.0 python whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164_git20231001-r0 apk From e6a5050ec82752500e96c2553b38fbd3034326be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 16 Nov 2024 06:41:39 +0000 Subject: [PATCH 508/525] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2dd07ab..3d605cb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -138,10 +138,10 @@ libltdl 2.4.7-r3 apk libmd 1.1.0-r0 apk libmediainfo 24.04-r0 apk libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r1 apk +libncursesw 6.4_p20240420-r2 apk libogg 1.3.5-r5 apk libopenmpt 0.7.7-r0 apk -libpanelw 6.4_p20240420-r1 apk +libpanelw 6.4_p20240420-r2 apk libpciaccess 0.18.1-r0 apk libplacebo 6.338.2-r1 apk libpng 1.6.44-r0 apk @@ -190,7 +190,7 @@ msgpack 1.0.7 python musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk my-test-package 1.0 python -ncurses-terminfo-base 6.4_p20240420-r1 apk +ncurses-terminfo-base 6.4_p20240420-r2 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk @@ -246,7 +246,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.4.0 python +setuptools 75.5.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From b8f7fb701335d583fc4750864ae16154ad978b01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 21 Nov 2024 06:43:06 +0000 Subject: [PATCH 509/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3d605cb..b2f6dec 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -246,7 +246,7 @@ scanelf 1.3.7-r2 apk sdl2 2.28.5-r1 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.5.0 python +setuptools 75.6.0 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 046484b0799d02405b1026dc4bd74048c3c836c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Nov 2024 08:41:19 +0000 Subject: [PATCH 510/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b2f6dec..9e85d63 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -291,7 +291,7 @@ webrtcvad-wheels 2.0.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python -wheel 0.45.0 python +wheel 0.45.1 python whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164_git20231001-r0 apk From 03331cba0518b74bf65577436d85cea417074351 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 12:56:46 +0000 Subject: [PATCH 511/525] Bot Updating Templated Files --- Jenkinsfile | 268 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bd1130f..e5955be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } // Input to determine if this is a package check parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') } // Configuration for the variables used for this specific repo environment { @@ -201,6 +201,7 @@ pipeline { env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -225,6 +226,7 @@ pipeline { env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -249,6 +251,7 @@ pipeline { env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -345,6 +348,35 @@ pipeline { else echo "No templates to delete" fi + echo "Starting Stage 2.5 - Update init diagram" + if ! grep -q 'init_diagram:' readme-vars.yml; then + echo "Adding the key 'init_diagram' to readme-vars.yml" + sed -i '\\|^#.*changelog.*$|d' readme-vars.yml + sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml + fi + mkdir -p ${TEMPDIR}/d2 + docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:development + ls -al ${TEMPDIR}/d2 + yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-development.d2\\")" readme-vars.yml + if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then + echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit." + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f development + cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml + git add readme-vars.yml + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Init diagram is unchanged" + fi echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} @@ -553,8 +585,40 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } // Build MultiArch Docker containers for push to LS Repo @@ -585,8 +649,40 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } stage('Build ARM64') { @@ -595,10 +691,6 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ @@ -614,18 +706,47 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry_backoff(5,5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } } sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : ''' + docker system prune -af --volumes || : + ''' } } } @@ -775,37 +896,23 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:development - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:development - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:development -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + ''' } } } @@ -816,57 +923,34 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi + done + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-development -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-development -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-development - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-development - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - ''' - } + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi + done + ''' } } } From ea0b3679334e5ebc0af0d02c5bfe8f9756b66041 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 12:58:37 +0000 Subject: [PATCH 512/525] Bot Updating Templated Files --- readme-vars.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index ab6190a..218feb7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -10,23 +10,63 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"} param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} - readonly_supported: true - # application setup block app_setup_block_enabled: true app_setup_block: | - Once running the URL will be `http://<host-ip>:6767`. - You must complete all the setup parameters in the webui before you can save the config. +# init diagram +init_diagram: | + "bazarr:development": { + docker-mods + base { + fix-attr +\nlegacy cont-init + } + docker-mods -> base + legacy-services + custom services + init-services -> legacy-services + init-services -> custom services + custom services -> legacy-services + legacy-services -> ci-service-check + init-migrations -> init-adduser + init-config -> init-bazarr-config + init-os-end -> init-config + init-bazarr-config -> init-config-end + init-config -> init-config-end + init-os-end -> init-crontab-config + init-mods-end -> init-custom-files + base -> init-envfile + base -> init-migrations + base -> init-mods + init-config-end -> init-mods + init-mods -> init-mods-end + init-mods-package-install -> init-mods-end + init-mods -> init-mods-package-install + base -> init-os-end + init-adduser -> init-os-end + init-envfile -> init-os-end + init-migrations -> init-os-end + init-custom-files -> init-services + init-mods-end -> init-services + init-services -> svc-bazarr + svc-bazarr -> legacy-services + init-services -> svc-cron + svc-cron -> legacy-services + } + Base Images: { + "baseimage-alpine:3.20" + } + "bazarr:development" <- Base Images # changelog changelogs: - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."} From bdc286871a645fbf5529066d7571cb1933281a73 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 13:00:45 +0000 Subject: [PATCH 513/525] Bot Updating Templated Files --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e0071c5..6537285 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ The architectures supported by this image are: - Once running the URL will be `http://<host-ip>:6767`. - You must complete all the setup parameters in the webui before you can save the config. - ## Read-Only Operation This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). @@ -71,6 +70,9 @@ This image can be run with a read-only container filesystem. For details please To help you get started creating a container from this image you can either use docker-compose or the docker cli. +>[!NOTE] +>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. + ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml @@ -110,7 +112,7 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 6767` | Allows HTTP access to the internal webserver. | +| `-p 6767:6767` | Allows HTTP access to the internal webserver. | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | From 98869a24f24de79c947633832673809dff9fe691 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Dec 2024 21:26:41 +0000 Subject: [PATCH 514/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 0e4f13f..0fa454c 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -43,16 +43,18 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbazarr%3Apull" \ | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.index.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}") + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") From 7e198d27a523b6c88e7fd737db95258275db4d7d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Dec 2024 21:30:19 +0000 Subject: [PATCH 515/525] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9e85d63..cb39656 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ alpine-release 3.20.3-r0 apk alsa-lib 1.2.11-r0 apk aniso8601 9.0.1 python aom-libs 3.9.1-r0 apk -apk-tools 2.14.4-r0 apk +apk-tools 2.14.4-r1 apk appdirs 1.4.4 python apprise 1.7.6 python apscheduler 3.10.4 python @@ -42,7 +42,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.1-r2 apk +curl 8.11.0-r2 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -117,7 +117,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r1 apk -libcurl 8.9.1-r2 apk +libcurl 8.11.0-r2 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk @@ -194,7 +194,7 @@ ncurses-terminfo-base 6.4_p20240420-r2 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.1.3 python +numpy 2.2.0 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -211,7 +211,7 @@ platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.10 python -pyc 3.12.7-r0 apk +pyc 3.12.8-r1 apk pycountry 23.12.11 python pydantic 1.10.14 python pygments 2.17.2 python @@ -226,9 +226,9 @@ python-anticaptcha 1.0.0 python python-dateutil 2.8.2 python python-engineio 4.9.0 python python-socketio 5.11.1 python -python3 3.12.7-r0 apk -python3-pyc 3.12.7-r0 apk -python3-pycache-pyc0 3.12.7-r0 apk +python3 3.12.8-r1 apk +python3-pyc 3.12.8-r1 apk +python3-pycache-pyc0 3.12.8-r1 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python From aa453ff28c63db2c573468f6fbee36aa21397ba7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 06:43:54 +0000 Subject: [PATCH 516/525] Bot Updating Templated Files --- Jenkinsfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e5955be..89f2a0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -585,7 +585,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -614,7 +614,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -649,7 +651,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -678,7 +680,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -706,7 +710,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://github.com/morpheus65535/bazarr) is a companion application to Sonarr and Radarr. It can manage and download subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -735,7 +739,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -978,7 +984,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "development",\ "name": "'${META_TAG}'",\ - "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From ea0a24a7f7b88707231206f4d3fb9f2a645df187 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 06:45:51 +0000 Subject: [PATCH 517/525] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 33 ++++++++++++++----- .../workflows/package_trigger_scheduler.yml | 27 ++++++++++++--- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 0fa454c..b3652e4 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,13 +48,30 @@ jobs: --header "Accept: application/vnd.oci.image.index.v1+json" \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/manifests/${tag}") - multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Accept: application/vnd.oci.image.manifest.v1+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # If there's a layer element it's a single-arch manifest so just get that digest + digest=$(jq -r '.config.digest' <<< "${multidigest}") + else + # Otherwise it's multi-arch or has manifest annotations + if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # Check for manifest annotations and delete if found + multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}") + fi + if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then + # If there's still more than one digest, it's multi-arch + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + else + # Otherwise it's single arch + multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}") + fi + if digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then + digest=$(jq -r '.config.digest' <<< "${digest}"); + fi + fi image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") @@ -92,7 +109,7 @@ jobs: else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY - if "${artifacts_found}" == "true" ]]; then + if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi response=$(curl -iX POST \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index f9d8978..09fd3c4 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -27,9 +27,18 @@ jobs: fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/jenkins-vars.yml) - if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then + if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/Jenkinsfile >/dev/null 2>&1; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bazarr/${br}/readme-vars.yml) + if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -37,7 +46,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`bazarr_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -49,6 +58,11 @@ jobs: response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + if [[ -z "${response}" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Jenkins build could not be triggered. Skipping branch." + continue + fi echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 @@ -56,11 +70,14 @@ jobs: buildurl="${buildurl%$'\r'}" echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ + if ! curl -ifX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" + --data-urlencode "Submit=Submit"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Unable to change the Jenkins job description." + fi sleep 20 fi else From 4d5f55334013ad536fc281dd4816994f52c41828 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 06:49:48 +0000 Subject: [PATCH 518/525] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cb39656..c30e6bc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,7 +42,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.11.0-r2 apk +curl 8.11.1-r0 apk dbus-libs 1.14.10-r1 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -117,7 +117,7 @@ libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r1 apk -libcurl 8.11.0-r2 apk +libcurl 8.11.1-r0 apk libdav1d 1.4.2-r0 apk libdovi 3.3.0-r0 apk libdrm 2.4.120-r0 apk From ab974821ce67b7ec08a9a057334278c5e067ec05 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Dec 2024 06:40:22 +0000 Subject: [PATCH 519/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c30e6bc..4ae9d56 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -194,7 +194,7 @@ ncurses-terminfo-base 6.4_p20240420-r2 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk numactl 2.0.18-r0 apk -numpy 2.2.0 python +numpy 2.2.1 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk From 4b004213c511eb87b6bd905083831955b8db7985 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 24 Dec 2024 16:11:19 +0000 Subject: [PATCH 520/525] Rebase to 3.21 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- README.md | 6 ++++++ readme-vars.yml | 2 ++ root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run | 8 +++++--- root/etc/s6-overlay/s6-rc.d/svc-bazarr/run | 13 ++++++++++--- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index abde698..bbce2fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest AS unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:3.21 # set version label ARG BUILD_DATE @@ -53,7 +53,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.20/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9c05605..27e3fd2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 # set version label ARG BUILD_DATE @@ -53,7 +53,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.20/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ \ -r /app/bazarr/bin/requirements.txt \ -r /app/bazarr/bin/postgres-requirements.txt && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/README.md b/README.md index 6537285..725783b 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,10 @@ The architectures supported by this image are: This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). +## Non-Root Operation + +This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -118,6 +122,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-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` | Persistent config files | | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | +| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). | ## Environment variables from files (Docker secrets) @@ -281,6 +286,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.12.24:** - Rebase to Alpine 3.21. * **06.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **19.09.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). diff --git a/readme-vars.yml b/readme-vars.yml index 218feb7..c3d6192 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,6 +19,7 @@ param_usage_include_ports: true param_ports: - {external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver."} readonly_supported: true +nonroot_supported: true # application setup block app_setup_block_enabled: true app_setup_block: | @@ -69,6 +70,7 @@ init_diagram: | "bazarr:development" <- Base Images # changelog changelogs: + - {date: "24.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "06.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "19.09.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run index 3a13f42..e0c7233 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run @@ -1,5 +1,7 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash -# permissions -lsiown -R abc:abc \ - /config +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + lsiown -R abc:abc \ + /config +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run index 56ca65d..3df693a 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run @@ -1,5 +1,12 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash -exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 6767" \ - s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py --no-update --config /config +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 6767" \ + cd /app/bazarr/bin s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py --no-update --config /config +else + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 6767" \ + cd /app/bazarr/bin python3 /app/bazarr/bin/bazarr.py --no-update --config /config +fi From 8f888a9d39ec9de64f2ec08d5eedd33769fd0abf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 25 Dec 2024 22:12:04 +0000 Subject: [PATCH 521/525] Bot Updating Templated Files --- readme-vars.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index c3d6192..a1a5930 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,28 +44,24 @@ init_diagram: | init-os-end -> init-config init-bazarr-config -> init-config-end init-config -> init-config-end - init-os-end -> init-crontab-config + init-crontab-config -> init-config-end + init-config -> init-crontab-config init-mods-end -> init-custom-files base -> init-envfile base -> init-migrations - base -> init-mods init-config-end -> init-mods - init-mods -> init-mods-end init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install - base -> init-os-end init-adduser -> init-os-end init-envfile -> init-os-end - init-migrations -> init-os-end init-custom-files -> init-services - init-mods-end -> init-services init-services -> svc-bazarr svc-bazarr -> legacy-services init-services -> svc-cron svc-cron -> legacy-services } Base Images: { - "baseimage-alpine:3.20" + "baseimage-alpine:3.21" } "bazarr:development" <- Base Images # changelog From 51c516902ca6b069090eab9ee6b250f0913376a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 25 Dec 2024 22:16:05 +0000 Subject: [PATCH 522/525] Bot Updating Package Versions --- package_versions.txt | 614 ++++++++++++++++++++++--------------------- 1 file changed, 308 insertions(+), 306 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4ae9d56..1c30c60 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,306 +1,308 @@ -NAME VERSION TYPE -Simple Launcher 1.1.0.14 dotnet (+5 duplicates) -alembic 1.13.1 python -alpine-baselayout 3.6.5-r0 apk -alpine-baselayout-data 3.6.5-r0 apk -alpine-keys 2.4-r1 apk -alpine-release 3.20.3-r0 apk -alsa-lib 1.2.11-r0 apk -aniso8601 9.0.1 python -aom-libs 3.9.1-r0 apk -apk-tools 2.14.4-r1 apk -appdirs 1.4.4 python -apprise 1.7.6 python -apscheduler 3.10.4 python -attrs 23.2.0 python -auditok 0.1.5 python -autocommand 2.2.2 python -babelfish 0.6.0 python -backports-functools-lru-cache 2.0.0 python -backports-tarfile 1.2.0 python -backports-zoneinfo 0.2.1 python -bash 5.2.26-r0 apk -beautifulsoup4 4.12.3 python -bidict 0.23.1 python -blinker 1.7.0 python -brotli-libs 1.1.0-r2 apk -busybox 1.36.1-r29 apk -busybox-binsh 1.36.1-r29 apk -c-ares 1.33.1-r0 apk -ca-certificates 20240705-r0 apk -ca-certificates-bundle 20240705-r0 apk -catatonit 0.2.0-r0 apk -certifi 2024.2.2 python -chardet 5.2.0 python -charset-normalizer 3.3.2 python -cjson 1.7.18-r0 apk -click 8.1.7 python -cloudscraper 1.2.58 python -colorama 0.4.6 python -commonmark 0.9.1 python -coreutils 9.5-r1 apk -coreutils-env 9.5-r1 apk -coreutils-fmt 9.5-r1 apk -coreutils-sha512sum 9.5-r1 apk -curl 8.11.1-r0 apk -dbus-libs 1.14.10-r1 apk -decorator 5.1.1 python -deep-translator 1.11.4 python -dnspython 2.6.1 python -dogpile-cache 1.3.2 python -dynaconf 3.2.4 python -enzyme 0.4.1 python -fcache 0.5.2 python -fese 0.3.0 python -ffmpeg 6.1.1-r8 apk -ffmpeg-libavcodec 6.1.1-r8 apk -ffmpeg-libavdevice 6.1.1-r8 apk -ffmpeg-libavfilter 6.1.1-r8 apk -ffmpeg-libavformat 6.1.1-r8 apk -ffmpeg-libavutil 6.1.1-r8 apk -ffmpeg-libpostproc 6.1.1-r8 apk -ffmpeg-libswresample 6.1.1-r8 apk -ffmpeg-libswscale 6.1.1-r8 apk -ffmpeg-python 0.2.0 python -ffsubsync 0.4.25 python -findutils 4.9.0-r5 apk -flask 3.0.2 python -flask-cors 4.0.0 python -flask-migrate 4.0.5 python -flask-restx 1.3.0 python -flask-socketio 5.3.6 python -flask-sqlalchemy 3.1.1 python -fontconfig 2.15.0-r1 apk -freetype 2.13.2-r0 apk -fribidi 1.0.15-r0 apk -ftfy 6.1.3 python -future 1.0.0 python -ga4mp 2.0.4 python -gdbm 1.23-r1 apk -giflib 5.2.2-r0 apk -glib 2.80.5-r0 apk -glslang-libs 1.3.261.1-r0 apk -graphite2 1.3.14-r6 apk -guess-language-spirit 0.5.3 python -guessit 3.8.0 python -h11 0.14.0 python -harfbuzz 8.5.0-r0 apk -html5lib 1.1 python -hwdata-pci 0.382-r0 apk -idna 3.6 python -imath 3.1.12-r0 apk -importlib-metadata 7.0.1 python -importlib-metadata 8.0.0 python -importlib-resources 6.1.2 python -inflect 7.0.0 python -inflect 7.3.1 python -itsdangerous 2.1.2 python -jaraco-collections 5.1.0 python -jaraco-context 5.3.0 python -jaraco-functools 4.0.1 python -jaraco-text 3.12.1 python -jinja2 3.1.3 python -jq 1.7.1-r0 apk -js2py 0.74 python -json-tricks 3.17.3 python -jsonschema 4.17.3 python -knowit 0.5.3 python -lame-libs 3.100-r5 apk -lcms2 2.16-r0 apk -libSvtAv1Enc 2.0.0-r1 apk -libacl 2.3.2-r0 apk -libass 0.17.2-r0 apk -libasyncns 0.8-r3 apk -libattr 2.5.2-r0 apk -libblkid 2.40.1-r1 apk -libbluray 1.3.4-r1 apk -libbsd 0.12.2-r0 apk -libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r1 apk -libcurl 8.11.1-r0 apk -libdav1d 1.4.2-r0 apk -libdovi 3.3.0-r0 apk -libdrm 2.4.120-r0 apk -libeconf 0.6.3-r0 apk -libexpat 2.6.4-r0 apk -libffi 3.4.6-r0 apk -libflac 1.4.3-r1 apk -libgcc 13.2.1_git20240309-r0 apk -libgcrypt 1.10.3-r0 apk -libgomp 13.2.1_git20240309-r0 apk -libgpg-error 1.49-r0 apk -libhwy 1.0.7-r0 apk -libidn2 2.3.7-r0 apk -libintl 0.22.5-r0 apk -libjpeg-turbo 3.0.3-r0 apk -libjxl 0.10.2-r0 apk -libltdl 2.4.7-r3 apk -libmd 1.1.0-r0 apk -libmediainfo 24.04-r0 apk -libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r2 apk -libogg 1.3.5-r5 apk -libopenmpt 0.7.7-r0 apk -libpanelw 6.4_p20240420-r2 apk -libpciaccess 0.18.1-r0 apk -libplacebo 6.338.2-r1 apk -libpng 1.6.44-r0 apk -libproc2 4.0.4-r0 apk -libpsl 0.21.5-r1 apk -libpulse 17.0-r0 apk -librist 0.2.10-r1 apk -libsharpyuv 1.3.2-r0 apk -libsndfile 1.2.2-r0 apk -libsodium 1.0.19-r0 apk -libsrt 1.5.3-r0 apk -libssh 0.10.6-r0 apk -libssl3 3.3.2-r1 apk -libstdc++ 13.2.1_git20240309-r0 apk -libtheora 1.1.1-r18 apk -libunibreak 6.1-r0 apk -libunistring 1.2-r0 apk -libva 2.21.0-r0 apk -libvdpau 1.5-r3 apk -libvorbis 1.3.7-r2 apk -libvpx 1.14.1-r0 apk -libwebp 1.3.2-r0 apk -libwebpmux 1.3.2-r0 apk -libx11 1.8.9-r1 apk -libxau 1.0.11-r4 apk -libxcb 1.16.1-r0 apk -libxdmcp 1.1.5-r1 apk -libxext 1.3.6-r2 apk -libxfixes 6.0.1-r4 apk -libxml2 2.12.7-r0 apk -libxslt 1.1.39-r1 apk -libzen 0.4.41-r0 apk -libzmq 4.3.5-r2 apk -lilv-libs 0.24.24-r1 apk -linux-pam 1.6.0-r0 apk -lxml 4.9.4 python -mako 1.3.2 python -markdown 3.5.2 python -markupsafe 2.1.5 python -mbedtls 3.6.2-r0 apk -mediainfo 24.04-r0 apk -more-itertools 10.3.0 python -mpdecimal 4.0.0-r0 apk -mpg123-libs 1.32.8-r0 apk -msgpack 1.0.7 python -musl 1.2.5-r0 apk -musl-utils 1.2.5-r0 apk -my-test-package 1.0 python -ncurses-terminfo-base 6.4_p20240420-r2 apk -netcat-openbsd 1.226-r0 apk -nghttp2-libs 1.62.1-r0 apk -numactl 2.0.18-r0 apk -numpy 2.2.1 python -oauthlib 3.2.2 python -onevpl-libs 2023.3.1-r2 apk -oniguruma 6.9.9-r0 apk -openexr-libiex 3.1.13-r1 apk -openexr-libilmthread 3.1.13-r1 apk -openexr-libopenexr 3.1.13-r1 apk -opus 1.5.2-r0 apk -orc 0.4.40-r0 apk -packaging 24.2 python -pcre2 10.43-r0 apk -pillow 11.0.0 python -pip 24.3.1 python -platformdirs 4.2.0 python -platformdirs 4.2.2 python -procps-ng 4.0.4-r0 apk -psycopg2-binary 2.9.10 python -pyc 3.12.8-r1 apk -pycountry 23.12.11 python -pydantic 1.10.14 python -pygments 2.17.2 python -pyjsparser 2.7.1 python -pymediainfo 6.1.0 python -pyparsing 3.1.1 python -pyrsistent 0.20.0 python -pysocks 1.7.1 python -pysrt 1.1.2 python -pysubs2 1.7.2 python -python-anticaptcha 1.0.0 python -python-dateutil 2.8.2 python -python-engineio 4.9.0 python -python-socketio 5.11.1 python -python3 3.12.8-r1 apk -python3-pyc 3.12.8-r1 apk -python3-pycache-pyc0 3.12.8-r1 apk -pytz 2024.1 python -pytz-deprecation-shim 0.1.0.post0 python -pyyaml 6.0.1 python -rarfile 4.1 python -rav1e-libs 0.7.1-r0 apk -readline 8.2.10-r0 apk -rebulk 3.2.0 python -referencing 0.23.0 python -requests 2.31.0 python -requests-oauthlib 1.3.1 python -requests-toolbelt 1.0.0 python -retry 0.9.2 python -rich 13.7.0 python -scanelf 1.3.7-r2 apk -sdl2 2.28.5-r1 apk -semver 3.0.2 python -serd-libs 0.32.2-r0 apk -setuptools 75.6.0 python -shaderc 2024.0-r0 apk -shadow 4.15.1-r0 apk -signalrcore 0.9.5 python -simple-websocket 1.0.0 python -six 1.16.0 python -skalibs 2.14.1.1-r0 apk -sord-libs 0.16.16-r0 apk -soupsieve 2.3.2.post1 python -soxr 0.1.3-r7 apk -speexdsp 1.2.1-r2 apk -spirv-tools 1.3.261.1-r0 apk -sqlalchemy 2.0.27 python -sqlite-libs 3.45.3-r1 apk -sratom 0.6.16-r0 apk -srt 3.5.3 python -ssl_client 1.36.1-r29 apk -stevedore 5.2.0 python -tdb-libs 1.4.9-r1 apk -textdistance 4.6.2 python -tinyxml2 10.0.0-r0 apk -tld 0.13 python -tomli 2.0.1 python -tqdm 4.66.2 python -trakit 0.2.1 python -typeguard 4.3.0 python -typing-extensions 4.10.0 python -typing-extensions 4.12.2 python -tzdata 2024.1 python -tzdata 2024b-r0 apk -tzlocal 5.2 python -unidecode 1.3.8 python -urllib3 2.2.1 python -utmps-libs 0.1.2.2-r1 apk -v4l-utils-libs 1.24.1-r1 apk -vidstab 1.1.1-r0 apk -vulkan-loader 1.3.261.1-r0 apk -waitress 3.0.0 python -wayland-libs-client 1.22.0-r4 apk -wcwidth 0.2.13 python -webencodings 0.5.1 python -webrtcvad-wheels 2.0.14 python -websocket-client 1.7.0 python -werkzeug 3.0.1 python -wheel 0.43.0 python -wheel 0.45.1 python -whichcraft 0.6.1 python -wsproto 1.2.0 python -x264-libs 0.164_git20231001-r0 apk -x265-libs 3.6-r0 apk -xvidcore 1.3.7-r2 apk -xz-libs 5.6.2-r0 apk -zimg 3.0.5-r2 apk -zipp 3.17.0 python -zipp 3.19.2 python -zix-libs 0.4.2-r0 apk -zlib 1.3.1-r1 apk -zstd-libs 1.5.6-r0 apk +NAME VERSION TYPE +Simple Launcher 1.1.0.14 dotnet (+5 duplicates) +acl-libs 2.3.2-r1 apk +alembic 1.13.1 python +alpine-baselayout 3.6.8-r0 apk +alpine-baselayout-data 3.6.8-r0 apk +alpine-keys 2.5-r0 apk +alpine-release 3.21.0-r0 apk +alsa-lib 1.2.12-r0 apk +aniso8601 9.0.1 python +aom-libs 3.11.0-r0 apk +apk-tools 2.14.6-r2 apk +appdirs 1.4.4 python +apprise 1.7.6 python +apscheduler 3.10.4 python +attrs 23.2.0 python +auditok 0.1.5 python +autocommand 2.2.2 python +babelfish 0.6.0 python +backports-functools-lru-cache 2.0.0 python +backports-tarfile 1.2.0 python +backports-zoneinfo 0.2.1 python +bash 5.2.37-r0 apk +beautifulsoup4 4.12.3 python +bidict 0.23.1 python +blinker 1.7.0 python +brotli-libs 1.1.0-r2 apk +busybox 1.37.0-r9 apk +busybox-binsh 1.37.0-r9 apk +c-ares 1.34.3-r0 apk +ca-certificates 20241010-r0 apk +ca-certificates-bundle 20241010-r0 apk +catatonit 0.2.0-r0 apk +certifi 2024.2.2 python +chardet 5.2.0 python +charset-normalizer 3.3.2 python +cjson 1.7.18-r0 apk +click 8.1.7 python +cloudscraper 1.2.58 python +colorama 0.4.6 python +commonmark 0.9.1 python +coreutils 9.5-r1 apk +coreutils-env 9.5-r1 apk +coreutils-fmt 9.5-r1 apk +coreutils-sha512sum 9.5-r1 apk +curl 8.11.1-r0 apk +dbus-libs 1.14.10-r4 apk +decorator 5.1.1 python +deep-translator 1.11.4 python +dnspython 2.6.1 python +dogpile-cache 1.3.2 python +dynaconf 3.2.4 python +enzyme 0.4.1 python +fcache 0.5.2 python +fese 0.3.0 python +ffmpeg 6.1.2-r1 apk +ffmpeg-libavcodec 6.1.2-r1 apk +ffmpeg-libavdevice 6.1.2-r1 apk +ffmpeg-libavfilter 6.1.2-r1 apk +ffmpeg-libavformat 6.1.2-r1 apk +ffmpeg-libavutil 6.1.2-r1 apk +ffmpeg-libpostproc 6.1.2-r1 apk +ffmpeg-libswresample 6.1.2-r1 apk +ffmpeg-libswscale 6.1.2-r1 apk +ffmpeg-python 0.2.0 python +ffsubsync 0.4.25 python +findutils 4.10.0-r0 apk +flask 3.0.2 python +flask-cors 4.0.0 python +flask-migrate 4.0.5 python +flask-restx 1.3.0 python +flask-socketio 5.3.6 python +flask-sqlalchemy 3.1.1 python +fontconfig 2.15.0-r1 apk +freetype 2.13.3-r0 apk +fribidi 1.0.16-r0 apk +ftfy 6.1.3 python +future 1.0.0 python +ga4mp 2.0.4 python +gdbm 1.24-r0 apk +giflib 5.2.2-r0 apk +glib 2.82.4-r0 apk +glslang-libs 1.3.296.0-r0 apk +graphite2 1.3.14-r6 apk +guess-language-spirit 0.5.3 python +guessit 3.8.0 python +h11 0.14.0 python +harfbuzz 9.0.0-r1 apk +html5lib 1.1 python +hwdata-pci 0.390-r0 apk +idna 3.6 python +imath 3.1.12-r0 apk +importlib-metadata 7.0.1 python +importlib-metadata 8.0.0 python +importlib-resources 6.1.2 python +inflect 7.0.0 python +inflect 7.3.1 python +itsdangerous 2.1.2 python +jaraco-collections 5.1.0 python +jaraco-context 5.3.0 python +jaraco-functools 4.0.1 python +jaraco-text 3.12.1 python +jinja2 3.1.3 python +jq 1.7.1-r0 apk +js2py 0.74 python +json-tricks 3.17.3 python +jsonschema 4.17.3 python +knowit 0.5.3 python +lame-libs 3.100-r5 apk +lcms2 2.16-r0 apk +libSvtAv1Enc 2.2.1-r0 apk +libass 0.17.3-r0 apk +libasyncns 0.8-r4 apk +libattr 2.5.2-r2 apk +libblkid 2.40.2-r4 apk +libbluray 1.3.4-r1 apk +libbsd 0.12.2-r0 apk +libbz2 1.0.8-r6 apk +libcrypto3 3.3.2-r4 apk +libcurl 8.11.1-r0 apk +libdav1d 1.5.0-r0 apk +libdeflate 1.22-r0 apk +libdovi 3.3.1-r0 apk +libdrm 2.4.123-r1 apk +libeconf 0.6.3-r0 apk +libexpat 2.6.4-r0 apk +libffi 3.4.6-r0 apk +libflac 1.4.3-r1 apk +libgcc 14.2.0-r4 apk +libgcrypt 1.10.3-r1 apk +libgomp 14.2.0-r4 apk +libgpg-error 1.51-r0 apk +libhwy 1.0.7-r0 apk +libidn2 2.3.7-r0 apk +libintl 0.22.5-r0 apk +libjpeg-turbo 3.0.4-r0 apk +libjxl 0.10.3-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 24.11-r0 apk +libmount 2.40.2-r4 apk +libncursesw 6.5_p20241006-r3 apk +libogg 1.3.5-r5 apk +libopenmpt 0.7.12-r0 apk +libpanelw 6.5_p20241006-r3 apk +libpciaccess 0.18.1-r0 apk +libplacebo 6.338.2-r3 apk +libpng 1.6.44-r0 apk +libproc2 4.0.4-r2 apk +libpsl 0.21.5-r3 apk +libpulse 17.0-r4 apk +librist 0.2.10-r1 apk +libsharpyuv 1.4.0-r0 apk +libsndfile 1.2.2-r0 apk +libsodium 1.0.20-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.11.1-r0 apk +libssl3 3.3.2-r4 apk +libstdc++ 14.2.0-r4 apk +libtheora 1.1.1-r18 apk +libunibreak 6.1-r0 apk +libunistring 1.2-r0 apk +libva 2.22.0-r1 apk +libvdpau 1.5-r4 apk +libvorbis 1.3.7-r2 apk +libvpx 1.15.0-r0 apk +libwebp 1.4.0-r0 apk +libwebpmux 1.4.0-r0 apk +libx11 1.8.10-r0 apk +libxau 1.0.11-r4 apk +libxcb 1.16.1-r0 apk +libxdmcp 1.1.5-r1 apk +libxext 1.3.6-r2 apk +libxfixes 6.0.1-r4 apk +libxml2 2.13.4-r3 apk +libxslt 1.1.42-r1 apk +libzen 0.4.41-r0 apk +libzmq 4.3.5-r2 apk +lilv-libs 0.24.24-r1 apk +linux-pam 1.6.1-r1 apk +lxml 4.9.4 python +mako 1.3.2 python +markdown 3.5.2 python +markupsafe 2.1.5 python +mbedtls 3.6.2-r0 apk +mediainfo 24.11-r0 apk +more-itertools 10.3.0 python +mpdecimal 4.0.0-r0 apk +mpg123-libs 1.32.9-r0 apk +msgpack 1.0.7 python +musl 1.2.5-r8 apk +musl-utils 1.2.5-r8 apk +my-test-package 1.0 python +ncurses-terminfo-base 6.5_p20241006-r3 apk +netcat-openbsd 1.226.1.1-r0 apk +nghttp2-libs 1.64.0-r0 apk +numactl 2.0.18-r0 apk +numpy 2.2.1 python +oauthlib 3.2.2 python +onevpl-libs 2023.3.1-r2 apk +oniguruma 6.9.9-r0 apk +openexr-libiex 3.3.2-r0 apk +openexr-libilmthread 3.3.2-r0 apk +openexr-libopenexr 3.3.2-r0 apk +openexr-libopenexrcore 3.3.2-r0 apk +opus 1.5.2-r1 apk +orc 0.4.40-r1 apk +packaging 24.2 python +pcre2 10.43-r0 apk +pillow 11.0.0 python +pip 24.3.1 python +platformdirs 4.2.0 python +platformdirs 4.2.2 python +procps-ng 4.0.4-r2 apk +psycopg2-binary 2.9.10 python +pyc 3.12.8-r1 apk +pycountry 23.12.11 python +pydantic 1.10.14 python +pygments 2.17.2 python +pyjsparser 2.7.1 python +pymediainfo 6.1.0 python +pyparsing 3.1.1 python +pyrsistent 0.20.0 python +pysocks 1.7.1 python +pysrt 1.1.2 python +pysubs2 1.7.2 python +python-anticaptcha 1.0.0 python +python-dateutil 2.8.2 python +python-engineio 4.9.0 python +python-socketio 5.11.1 python +python3 3.12.8-r1 apk +python3-pyc 3.12.8-r1 apk +python3-pycache-pyc0 3.12.8-r1 apk +pytz 2024.1 python +pytz-deprecation-shim 0.1.0.post0 python +pyyaml 6.0.1 python +rarfile 4.1 python +rav1e-libs 0.7.1-r0 apk +readline 8.2.13-r0 apk +rebulk 3.2.0 python +referencing 0.23.0 python +requests 2.31.0 python +requests-oauthlib 1.3.1 python +requests-toolbelt 1.0.0 python +retry 0.9.2 python +rich 13.7.0 python +scanelf 1.3.8-r1 apk +sdl2 2.30.9-r0 apk +semver 3.0.2 python +serd-libs 0.32.2-r0 apk +setuptools 75.6.0 python +shaderc 2024.0-r2 apk +shadow 4.16.0-r1 apk +signalrcore 0.9.5 python +simple-websocket 1.0.0 python +six 1.16.0 python +skalibs-libs 2.14.3.0-r0 apk +sord-libs 0.16.16-r0 apk +soupsieve 2.3.2.post1 python +soxr 0.1.3-r7 apk +speexdsp 1.2.1-r2 apk +spirv-tools 1.3.290.0-r0 apk +sqlalchemy 2.0.27 python +sqlite-libs 3.47.1-r0 apk +sratom 0.6.16-r0 apk +srt 3.5.3 python +ssl_client 1.37.0-r9 apk +stevedore 5.2.0 python +tdb-libs 1.4.12-r0 apk +textdistance 4.6.2 python +tinyxml2 10.0.0-r0 apk +tld 0.13 python +tomli 2.0.1 python +tqdm 4.66.2 python +trakit 0.2.1 python +typeguard 4.3.0 python +typing-extensions 4.10.0 python +typing-extensions 4.12.2 python +tzdata 2024.1 python +tzdata 2024b-r1 apk +tzlocal 5.2 python +unidecode 1.3.8 python +urllib3 2.2.1 python +utmps-libs 0.1.2.3-r2 apk +v4l-utils-libs 1.28.1-r1 apk +vidstab 1.1.1-r0 apk +vulkan-loader 1.3.296.0-r0 apk +waitress 3.0.0 python +wayland-libs-client 1.23.1-r0 apk +wcwidth 0.2.13 python +webencodings 0.5.1 python +webrtcvad-wheels 2.0.14 python +websocket-client 1.7.0 python +werkzeug 3.0.1 python +wheel 0.43.0 python +wheel 0.45.1 python +whichcraft 0.6.1 python +wsproto 1.2.0 python +x264-libs 0.164.3108-r0 apk +x265-libs 3.6-r0 apk +xvidcore 1.3.7-r2 apk +xz-libs 5.6.3-r0 apk +zimg 3.0.5-r2 apk +zipp 3.17.0 python +zipp 3.19.2 python +zix-libs 0.4.2-r0 apk +zlib 1.3.1-r2 apk +zstd-libs 1.5.6-r1 apk From 884c0faea24654af4f97e34329574c2eaa8bc485 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 29 Dec 2024 06:40:36 +0000 Subject: [PATCH 523/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1c30c60..1473b3b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -305,4 +305,4 @@ zipp 3.17.0 python zipp 3.19.2 python zix-libs 0.4.2-r0 apk zlib 1.3.1-r2 apk -zstd-libs 1.5.6-r1 apk +zstd-libs 1.5.6-r2 apk From e1af4325ebffced49ce60ddb9a709bd546a960f2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 1 Jan 2025 16:36:43 +0000 Subject: [PATCH 524/525] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1473b3b..825186d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -151,7 +151,7 @@ libpsl 0.21.5-r3 apk libpulse 17.0-r4 apk librist 0.2.10-r1 apk libsharpyuv 1.4.0-r0 apk -libsndfile 1.2.2-r0 apk +libsndfile 1.2.2-r2 apk libsodium 1.0.20-r0 apk libsrt 1.5.3-r0 apk libssh 0.11.1-r0 apk From e327c6b47c7b2f0b59769419586b2e2c2726808b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Jan 2025 21:28:22 +0000 Subject: [PATCH 525/525] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 825186d..86fa018 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,8 +2,8 @@ NAME VERSION TYPE Simple Launcher 1.1.0.14 dotnet (+5 duplicates) acl-libs 2.3.2-r1 apk alembic 1.13.1 python -alpine-baselayout 3.6.8-r0 apk -alpine-baselayout-data 3.6.8-r0 apk +alpine-baselayout 3.6.8-r1 apk +alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk alpine-release 3.21.0-r0 apk alsa-lib 1.2.12-r0 apk @@ -28,8 +28,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r9 apk busybox-binsh 1.37.0-r9 apk c-ares 1.34.3-r0 apk -ca-certificates 20241010-r0 apk -ca-certificates-bundle 20241010-r0 apk +ca-certificates 20241121-r0 apk +ca-certificates-bundle 20241121-r0 apk catatonit 0.2.0-r0 apk certifi 2024.2.2 python chardet 5.2.0 python @@ -207,7 +207,7 @@ opus 1.5.2-r1 apk orc 0.4.40-r1 apk packaging 24.2 python pcre2 10.43-r0 apk -pillow 11.0.0 python +pillow 11.1.0 python pip 24.3.1 python platformdirs 4.2.0 python platformdirs 4.2.2 python @@ -248,7 +248,7 @@ scanelf 1.3.8-r1 apk sdl2 2.30.9-r0 apk semver 3.0.2 python serd-libs 0.32.2-r0 apk -setuptools 75.6.0 python +setuptools 75.7.0 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python