From 62a4ff3b34479c49cd31f5ec6ff31b6d37477085 Mon Sep 17 00:00:00 2001 From: chbmb Date: Mon, 24 Sep 2018 00:24:47 +0100 Subject: [PATCH 001/438] Update readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 91b547a..b556ea0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,7 +19,7 @@ param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "", desc: "Bazarr data" } - { vol_path: "/movies", vol_host_path: "", desc: "Location of your movies" } - - { vol_path: "/tv", vol_host_path: "", 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." } From e80f01f7dab7e4c640b6d077d7aacc4b6c18ab81 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 23 Sep 2018 23:25:36 +0000 Subject: [PATCH 002/438] Bot Updating README from template --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 113b7d4..327672a 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ docker create \ -p 6767:6767 \ -v :/config \ -v :/movies \ - -v :/tv \ linuxserver/bazarr ``` @@ -80,7 +80,7 @@ services: volumes: - :/config - :/movies - - :/tv ports: - 6767:6767 mem_limit: 4096m From e5de06aef5f2e881db091ac5789c53232ce66f5f Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 23 Sep 2018 22:52:56 -0700 Subject: [PATCH 003/438] updating Readme to show development docker tag --- README.md | 5 +++++ readme-vars.yml | 9 +++++++++ 2 files changed, 14 insertions(+) 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 db9d4001ecaa53eb3c853460a8c6d7d4ccc02d15 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 25 Sep 2018 18:03:41 +0100 Subject: [PATCH 004/438] fix log warning about backports --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d3d89de..9cbd74f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,8 @@ RUN \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** fix backports warning in log ****" && \ + touch /usr/lib/python2.7/site-packages/backports/__init__.py && \ rm -rf \ /tmp/* From bbf3539f118a9dc0c07d2b7de6febe4f7b19acee Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Tue, 25 Sep 2018 18:14:03 +0100 Subject: [PATCH 005/438] refine backports fix --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9cbd74f..c2f51d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,10 @@ RUN \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ echo "**** fix backports warning in log ****" && \ - touch /usr/lib/python2.7/site-packages/backports/__init__.py && \ + if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ + then \ + touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ + fi && \ rm -rf \ /tmp/* From 696999855321f4f2b5b28edf927052940b14a58a Mon Sep 17 00:00:00 2001 From: chbmb Date: Tue, 25 Sep 2018 19:48:29 +0100 Subject: [PATCH 006/438] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f65aa8a..ead6a15 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -24,6 +24,11 @@ RUN \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** fix backports warning in log ****" && \ + if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ + then \ + touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ + fi && \ rm -rf \ /tmp/* From b8281494b595036d1d5ea1ab5070c7d731f23a35 Mon Sep 17 00:00:00 2001 From: chbmb Date: Tue, 25 Sep 2018 19:49:04 +0100 Subject: [PATCH 007/438] Update Dockerfile.armhf --- Dockerfile.armhf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 555e2c3..3b4fba6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -24,6 +24,11 @@ RUN \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** fix backports warning in log ****" && \ + if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ + then \ + touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ + fi && \ rm -rf \ /tmp/* From 4784e296384d6674a707fafb04bc5faafa437956 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 12 Oct 2018 00:12:47 -0700 Subject: [PATCH 008/438] fixing manifest endpoint for aarch64 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 080650a..521fb16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -397,11 +397,11 @@ pipeline { 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 manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --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 armv8" + sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:latest" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" } From d27a2d1b6f4c82a475200518134b6ddea7ce4ab2 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 1 Nov 2018 23:52:56 -0700 Subject: [PATCH 009/438] adding updated build logic for package tagging to repo --- Jenkinsfile | 289 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 194 insertions(+), 95 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 521fb16..93e74da 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 = 'master' @@ -17,8 +21,6 @@ pipeline { 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' @@ -33,6 +35,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/latest | jq -r '. | .tag_name' ''', returnStdout: true).trim() @@ -72,11 +75,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() } } } @@ -202,92 +216,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 +382,7 @@ pipeline { stage('Test') { when { environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -320,7 +408,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 +429,7 @@ pipeline { stage('Docker-Push-Single') { when { environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -365,6 +454,7 @@ pipeline { stage('Docker-Push-Multi') { when { environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -415,6 +505,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 +531,7 @@ pipeline { stage('Sync-README') { when { environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' } steps { withCredentials([ @@ -467,15 +559,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 b7cad8f1029e4d4ba21715e27b6268ac5a587af9 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 2 Nov 2018 00:20:36 -0700 Subject: [PATCH 010/438] forgot to add env variables to the ci run --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 93e74da..e4d699f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,6 +27,7 @@ pipeline { CI_PORT='6767' CI_SSL='false' CI_DELAY='120' + CI_DOCKERENV='TZ=US/Pacific' CI_AUTH='user:password' CI_WEBPATH='' } From 183730d8c76e984748030a19b45d05204866153a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Nov 2018 21:28:00 +0000 Subject: [PATCH 011/438] Bot Updating README from template --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a526b9..e47d029 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 From 7f15d1e9bbf6afb6d1d155e573ff8650de13eb6d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Nov 2018 21:32:54 +0000 Subject: [PATCH 012/438] 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..9c43817 --- /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-r6 +lcms2 lcms2-2.9-r0 +libffi libffi-3.2.1-r4 +libwebp libwebp-1.0.0-r0 +openjpeg openjpeg-2.3.0-r0 +libcrypto1.0 libcrypto1.0-1.0.2p-r0 +libssl1.0 libssl1.0-1.0.2p-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-r0 +curl curl-7.61.1-r0 +pcre2 pcre2-10.31-r0 +git git-2.18.1-r0 +openssl openssl-1.0.2p-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 9bff1e6ccc5ef287e1c7a866dc3090db0e455b6f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Nov 2018 04:45:01 +0000 Subject: [PATCH 013/438] Bot Updating README from template --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e47d029..1e2e89b 100644 --- a/README.md +++ b/README.md @@ -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) @@ -58,6 +59,7 @@ docker create \ -v :/config \ -v :/movies \ -v :/tv \ + --restart unless-stopped linuxserver/bazarr ``` From 87a44974ba3c67ce9a04922ff6177c6b82b71d7d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 14 Nov 2018 17:45:54 +0000 Subject: [PATCH 014/438] 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 9c43817..923056d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,8 +31,8 @@ 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-r6 -lcms2 lcms2-2.9-r0 +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 @@ -44,8 +44,8 @@ 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-r0 -curl curl-7.61.1-r0 +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.2p-r0 From 2bcce1e0126b2bb7198e703c6cab02ca8c22f637 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Nov 2018 11:07:06 +0000 Subject: [PATCH 015/438] 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 923056d..a58051e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,8 +36,8 @@ 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.2p-r0 -libssl1.0 libssl1.0-1.0.2p-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 @@ -48,7 +48,7 @@ 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.2p-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 From 231f2ea7aa9ea34b80ec11d515027ebe06526abf Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 3 Dec 2018 20:09:34 -0800 Subject: [PATCH 016/438] adding build logic templating to repository on master --- Jenkinsfile | 577 ++---------------------------------------------- jenkins-var.yml | 29 +++ 2 files changed, 49 insertions(+), 557 deletions(-) create mode 100644 jenkins-var.yml diff --git a/Jenkinsfile b/Jenkinsfile index e4d699f..a72f8a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,178 +2,16 @@ 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 = 'master' - 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' - 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/latest | jq -r '. | .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 stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', - returnStdout: true).trim() - } - } - } - // 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 - } - } - } - // If this is a master build use live docker endpoints - stage("Set ENV live build"){ - when { - branch "master" - 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 "master"} - 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') { + // Use helper containers to render templated files + stage('Update-Templates') { when { branch "master" environment name: 'CHANGE_ID', value: '' @@ -184,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=master -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=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 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}/ + 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}:latest" - sh "docker push ${IMAGE}:latest" - 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-latest" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" - 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 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}:latest" - 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 "master" - 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 master",\ - "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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ - "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 - 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..528d8af --- /dev/null +++ b/jenkins-var.yml @@ -0,0 +1,29 @@ +--- + +# jenkins variables +project_name: docker-bazarr +external_type: github_stable +release_type: stable +release_tag: latest +ls_branch: master +repo_vars: + - EXT_GIT_BRANCH = 'master' + - 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' + - 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 64fa3aa1c6db62ed86ee9ba15380bd9a7eb78b4f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Dec 2018 10:46:54 +0000 Subject: [PATCH 017/438] Bot Updating Templated Files --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1e2e89b..9327aae 100644 --- a/README.md +++ b/README.md @@ -33,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 | @@ -59,7 +59,7 @@ docker create \ -v :/config \ -v :/movies \ -v :/tv \ - --restart unless-stopped + --restart unless-stopped \ linuxserver/bazarr ``` From 8f7d985aae3c0e7ba144ee3e5f08b14d19c67aa7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 6 Dec 2018 07:28:44 -0500 Subject: [PATCH 018/438] 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 8da8f3c7a4b41c5260311aec0d8041f75744094a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Dec 2018 12:33:27 +0000 Subject: [PATCH 019/438] Bot Updating Templated Files --- Jenkinsfile | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 551 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a72f8a7..fb9f523 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,14 +2,176 @@ 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 = 'master' + 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' + 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/latest | jq -r '. | .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 stable github release use the latest endpoint from github to determine the ext tag + stage("Set ENV github_stable"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', + returnStdout: true).trim() + } + } + } + // 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 + } + } + } + // If this is a master build use live docker endpoints + stage("Set ENV live build"){ + when { + branch "master" + 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 "master"} + 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 { @@ -21,23 +183,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=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=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 master + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 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}/ 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 "master" + 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 "master" + 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 master + 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 + 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}:latest" + sh "docker push ${IMAGE}:latest" + 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-latest" + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" + 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 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}:latest" + 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 "master" + 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 master",\ + "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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "target_commitish": "master",\ + "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 + 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 dfee5d16825b97082b04a40116eee72bd9b3bcb2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 12 Dec 2018 17:43:59 +0000 Subject: [PATCH 020/438] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb9f523..2f94b06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -325,12 +325,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 From 35481cf84a7894361cc7df3de0bf835c38461e59 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 12 Dec 2018 17:48:24 +0000 Subject: [PATCH 021/438] 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 620748cc50ec3f5f18959eb1cadbcb4c1fd84e97 Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 19 Dec 2018 06:28:46 +0000 Subject: [PATCH 022/438] Add py-gevent New dependency for Bazarr. Tested in development branch by Morpheus. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index c2f51d3..3ad79b7 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/releases/latest" \ From 9bfc7e903bcd326d15604373e8ccf7fdc4ceca39 Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 19 Dec 2018 06:29:47 +0000 Subject: [PATCH 023/438] Update Dockerfile.aarch64 --- Dockerfile.aarch64 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ead6a15..ad95379 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/releases/latest" \ From 60ceeb50cf559452381780c42b07ee5145a7091a Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 19 Dec 2018 06:30:22 +0000 Subject: [PATCH 024/438] Update Dockerfile.armhf --- Dockerfile.armhf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3b4fba6..964dc85 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/releases/latest" \ From 858f9ec31f549550fd9417e1e5cb94e89dab5cd8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Dec 2018 07:07:57 +0000 Subject: [PATCH 025/438] 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 95fe994471ad7c0f86922918bfef0e42cac1c289 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Dec 2018 19:31:24 +0000 Subject: [PATCH 026/438] Bot Updating Templated Files --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2f94b06..aebb14e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -328,10 +328,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 8e609f41d476d528c7fc7439a37c1da51e7c78e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 26 Dec 2018 17:44:11 +0000 Subject: [PATCH 027/438] Bot Updating Templated Files --- Jenkinsfile | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aebb14e..56a6fb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,6 +116,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 master build use live docker endpoints stage("Set ENV live build"){ when { @@ -126,11 +136,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 } } } @@ -144,11 +154,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/' } } @@ -162,11 +172,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/' } @@ -500,7 +510,7 @@ pipeline { 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 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" @@ -514,25 +524,25 @@ pipeline { when { branch "master" 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 master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\ "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}/releases/latest | jq '. |.body' | 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": "master",\ - "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": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done From e1e0b687e7fd025c483ff8f61aa24894de129299 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Jan 2019 17:43:51 +0000 Subject: [PATCH 028/438] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 56a6fb7..d478c27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -410,6 +410,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 @@ -438,9 +441,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' - } } } } From 123b41c9e95a5edaf6e1d45fd53e7708c2f13d05 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Jan 2019 17:43:53 +0000 Subject: [PATCH 029/438] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d478c27..80f0835 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -121,7 +121,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() } } @@ -345,17 +345,22 @@ pipeline { 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 + 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 master 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 c90f43593cc66880c3c225afa3c051a749239643 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 9 Jan 2019 17:48:44 +0000 Subject: [PATCH 030/438] 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 8df43dd2bdca37fe08fd3583d5a6fe7265d62962 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Jan 2019 03:19:37 +0000 Subject: [PATCH 031/438] Bot Updating Templated Files --- Jenkinsfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80f0835..558f0bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,14 +82,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}/master/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}/master/package_versions.txt \ - | md5sum | cut -c1-8 + echo none fi''', returnStdout: true).trim() } @@ -342,7 +338,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 -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 NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) From 4df6eedfd552fa9725e834324405d8fe6db842d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Jan 2019 03:23:11 +0000 Subject: [PATCH 032/438] 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 0881a19dbbb60f1d6bd3f6bf766a7a7ba39ac7a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Jan 2019 04:37:43 +0000 Subject: [PATCH 033/438] 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 ba9b8c3b2ebfe3fdc6b4d18da3bc774af2442e63 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Feb 2019 22:38:28 +0000 Subject: [PATCH 034/438] Bot Updating Templated Files --- Jenkinsfile | 9 +++++++++ README.md | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 558f0bb..ac5eeda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -209,6 +209,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 [ ! -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 9327aae..177a6e9 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. From 2b8ef0f323630f62660c97d8c59d2323891705a9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Feb 2019 22:38:34 +0000 Subject: [PATCH 035/438] Bot Updating Templated Files --- Jenkinsfile | 2 +- README.md | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac5eeda..31aeb32 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -211,7 +211,7 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [ ! -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 diff --git a/README.md b/README.md index 177a6e9..91a796d 100644 --- a/README.md +++ b/README.md @@ -126,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 @@ -143,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 29a4fb027520d9b9615c1766bd1766c86a7e8128 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 22 Feb 2019 17:23:03 -0800 Subject: [PATCH 036/438] 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 3ad79b7..e248e59 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 ad95379..f3b3e61 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 964dc85..5ff5dbc 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 45d236c..5327102 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 1bdf8cfdb577a98403379cb3542bdb560fa377ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 00:24:34 -0500 Subject: [PATCH 037/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 91a796d..2329e3e 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 549a03d82d98af8cfbef2b49e97647f13c709a27 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 00:33:48 -0500 Subject: [PATCH 038/438] 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 b02768d..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.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-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 50b147ae169f9e2f44721d2474b623adcaa3b081 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Feb 2019 22:38:32 +0000 Subject: [PATCH 039/438] Bot Updating Templated Files --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 2329e3e..83f0bb9 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 a788d9d5c755a0b684af97c1b776970e694a196b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Mar 2019 22:38:36 +0000 Subject: [PATCH 040/438] Bot Updating Templated Files --- Jenkinsfile | 35 +++++++++++++++++++++++++++++++++-- README.md | 32 +++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 31aeb32..c5fc4a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .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' ''', @@ -292,6 +292,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} ''' } } } @@ -318,6 +321,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} ''' } } } @@ -347,7 +353,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 ) @@ -479,6 +485,10 @@ pipeline { sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" sh "docker push ${IMAGE}:latest" sh "docker push ${IMAGE}:${META_TAG}" + sh '''docker rmi \ + ${IMAGE}:${META_TAG} \ + ${IMAGE}:latest ''' + } } } @@ -526,6 +536,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}:latest" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" + sh '''docker rmi \ + ${IMAGE}:amd64-${META_TAG} \ + ${IMAGE}:amd64-latest \ + ${IMAGE}:arm32v6-${META_TAG} \ + ${IMAGE}:arm32v6-latest \ + ${IMAGE}:arm64v8-${META_TAG} \ + ${IMAGE}:arm64v8-latest \ + lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -586,6 +605,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 83f0bb9..38d426b 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: - :/tv ports: - 6767:6767 - mem_limit: 4096m restart: unless-stopped ``` @@ -100,8 +99,8 @@ Container images are configured using parameters passed at runtime (such as thos | Parameter | Function | | :----: | --- | | `-p 6767` | Allows HTTP access to the internal webserver. | -| `-e PUID=1001` | for UserID - see below for explanation | -| `-e PGID=1001` | for GroupID - see below for explanation | +| `-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 | | `-v /config` | Bazarr data | | `-v /movies` | Location of your movies | @@ -113,11 +112,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS 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=1001` and `PGID=1001`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: ``` $ id username - uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) + uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` @@ -152,9 +151,20 @@ 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 the image: `docker-compose pull linuxserver/bazarr` -* Let compose update containers as necessary: `docker-compose up -d` +* 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` ## Versions From e7fcb6aeb421364f587da73b5e446cf2871d127c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Mar 2019 22:51:33 +0000 Subject: [PATCH 041/438] 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 4b0ccf6a7fcff08d3493e0c232e537c8898db94b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Mar 2019 23:23:37 -0400 Subject: [PATCH 042/438] 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 5e143830afff8a08f03a25538175afb7c20ec29e Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Mar 2019 16:16:19 -0700 Subject: [PATCH 043/438] 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 e248e59..3a20de0 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 f3b3e61..658a79d 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 5ff5dbc..040deee 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 c5fc4a0..c37f880 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -132,7 +132,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 } @@ -150,7 +150,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 } @@ -168,7 +168,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 } @@ -178,6 +178,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 { @@ -252,7 +281,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} ." } } @@ -265,7 +294,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} ." } } @@ -288,13 +317,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} ''' } } } @@ -317,7 +346,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}" @@ -347,13 +376,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 ) @@ -433,9 +462,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 \ @@ -512,38 +541,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-latest" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" 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-latest" - sh "docker push ${IMAGE}:arm32v6-latest" + sh "docker push ${IMAGE}:arm32v7-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 create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" + sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --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}:latest" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:amd64-${META_TAG} \ ${IMAGE}:amd64-latest \ - ${IMAGE}:arm32v6-${META_TAG} \ - ${IMAGE}:arm32v6-latest \ + ${IMAGE}:arm32v7-${META_TAG} \ + ${IMAGE}:arm32v7-latest \ ${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-latest \ - lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } @@ -614,7 +643,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}'"}' ''' } } } @@ -629,12 +658,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 38d426b..58672a5 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 5327102..e0338d4 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 db3dab14c5407a19397307e41c99e2caee6a7932 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Mar 2019 19:32:50 +0000 Subject: [PATCH 044/438] 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 a1b8abfa097cf1f0817bf3bdde4da9cefff4ad04 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Apr 2019 17:43:04 -0400 Subject: [PATCH 045/438] 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 06c23ce14f26ff6e7987db0cee0224adc40d1d75 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Apr 2019 17:46:25 -0400 Subject: [PATCH 046/438] 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 a1b9c3c2247874aae9111d73683e836c088efb82 Mon Sep 17 00:00:00 2001 From: chbmb Date: Sat, 13 Apr 2019 12:42:43 +0100 Subject: [PATCH 047/438] Change project homepage @[morpheus65535](https://github.com/morpheus65535) the dev, has pinged me on Discord to ask we change the project homepage now he has an official domain. --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index e0338d4..f2cbe76 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -2,7 +2,7 @@ # project information project_name: bazarr -project_url: "https://github.com/morpheus65535/bazarr" +project_url: "https://www.bazarr.media/" 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 }}" From 4f32b6d6b106b36867162411e707829241a7a76c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Apr 2019 11:53:20 +0000 Subject: [PATCH 048/438] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58672a5..f88e118 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Find us at: [![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. +[Bazarr](https://www.bazarr.media/) 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) +[![bazarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png)](https://www.bazarr.media/) ## Supported Architectures From 405ee40ad4fa07de6416b0498ff29ab38784ba8a Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 17 Apr 2019 14:29:18 -0700 Subject: [PATCH 049/438] set a default timezone as it is required for the application to even run --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.armhf | 2 ++ README.md | 1 + readme-vars.yml | 1 + 5 files changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3a20de0..e134b18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ 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/UCT" RUN \ echo "**** install packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 658a79d..1ccf4e8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -6,6 +6,8 @@ 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/UCT" RUN \ echo "**** install packages ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 040deee..650afc1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -6,6 +6,8 @@ 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/UCT" RUN \ echo "**** install packages ****" && \ diff --git a/README.md b/README.md index f88e118..c87f696 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ Below are the instructions for updating containers: ## Versions +* **17.04.19:** - Add default UTC timezone if user does not set it. * **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 f2cbe76..05ef18a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,6 +44,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.04.19:", desc: "Add default UTC timezone if user does not set it." } - { 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 049d690834a72ac8dfee4e394835511ff435fef5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 17 Apr 2019 14:54:25 -0700 Subject: [PATCH 050/438] update to UTC --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e134b18..6e9fabc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ 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/UCT" +ENV TZ="Etc/UTC" RUN \ echo "**** install packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1ccf4e8..6c9b9c8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,7 +7,7 @@ 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/UCT" +ENV TZ="Etc/UTC" RUN \ echo "**** install packages ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 650afc1..5bca667 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -7,7 +7,7 @@ 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/UCT" +ENV TZ="Etc/UTC" RUN \ echo "**** install packages ****" && \ From a550c0c276fd4dd45c34d19a6182bf4795d96ca4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 17 Apr 2019 22:21:22 +0000 Subject: [PATCH 051/438] 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 233f36b991679a81e71fe6d1e3d16e42722bca6d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Apr 2019 17:50:38 -0400 Subject: [PATCH 052/438] 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 a36daab1374db7ae8c0e26acace91a7a92974bf2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 May 2019 17:39:12 -0400 Subject: [PATCH 053/438] Bot Updating Templated Files --- Jenkinsfile | 28 ++++++++++++---------------- README.md | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c37f880..663235f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 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' ''', @@ -240,7 +240,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 @@ -315,15 +315,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} || :''' } } } @@ -344,15 +342,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} || :''' } } } @@ -516,7 +512,7 @@ pipeline { sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest ''' + ${IMAGE}:latest || :''' } } @@ -573,7 +569,7 @@ pipeline { ${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-latest \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -582,25 +578,25 @@ pipeline { when { branch "master" 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 master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "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}/releases/latest | jq '. |.body' | 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": "master",\ - "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": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done diff --git a/README.md b/README.md index c87f696..fe532f5 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 * **17.04.19:** - Add default UTC timezone if user does not set it. From 29f370384846dd53da739b82a8bce6b035170501 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 May 2019 12:19:50 +0100 Subject: [PATCH 054/438] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe532f5..b601030 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,7 @@ Below are the instructions for updating containers: ``` docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower + containrrr/watchtower \ --run-once bazarr ``` * You can also remove the old dangling images: `docker image prune` From e680ad86512be8476d20217a8d56bdcf5d30af7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 May 2019 12:31:00 +0100 Subject: [PATCH 055/438] 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 2fe9e7d97fc263badc332700bda48d78e248e248 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 May 2019 17:42:27 -0400 Subject: [PATCH 056/438] 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 900f7d44d47cbeba2e24d59045ed9d0fcd2f17e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 May 2019 17:38:56 -0400 Subject: [PATCH 057/438] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 663235f..e57b842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,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( @@ -224,14 +232,17 @@ pipeline { 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=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 + 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 master 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 8dd83caba8a55fb94bf407134ac52b38d6506c35 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 May 2019 17:40:25 -0400 Subject: [PATCH 058/438] 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 e15f65d9009ec007ed2a9718906f5dddfc27df0c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Jun 2019 21:20:29 -0400 Subject: [PATCH 059/438] Bot Updating Templated Files --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e57b842..8d85ff9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -475,6 +475,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 a3972f06883572eb9335853bac1fff1734338109 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Jun 2019 21:28:44 -0400 Subject: [PATCH 060/438] 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 af318281671f8f27cb4725de3a7fac69754fceb3 Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 12 Jun 2019 01:54:46 +0100 Subject: [PATCH 061/438] Install requirements.txt RE: https://github.com/morpheus65535/bazarr/issues/461 Only thing that stood out was we were missing `lxml` and we install `py-gevents` from the Alpine repository rather than via pip which means it's a little older. Switch to pip install. --- Dockerfile | 17 ++++++++++++++--- Dockerfile.aarch64 | 16 +++++++++++++--- Dockerfile.armhf | 16 +++++++++++++--- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e9fabc..6701a67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,13 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ -echo "**** install packages ****" && \ - apk add --no-cache \ - py-gevent && \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + libxslt-dev \ + python-dev && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ @@ -26,12 +30,19 @@ echo "**** install packages ****" && \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ echo "**** fix backports warning in log ****" && \ if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ then \ touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ fi && \ + 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 6c9b9c8..16eb5b1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,9 +10,12 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ -echo "**** install packages ****" && \ - apk add --no-cache \ - py-gevent && \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + python-dev && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ @@ -26,12 +29,19 @@ echo "**** install packages ****" && \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ echo "**** fix backports warning in log ****" && \ if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ then \ touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ fi && \ + 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 5bca667..e42810b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -10,9 +10,12 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ -echo "**** install packages ****" && \ - apk add --no-cache \ - py-gevent && \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + g++ \ + gcc \ + libxml2-dev \ + python-dev && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ BAZARR_VERSION=$(curl -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" \ @@ -26,12 +29,19 @@ echo "**** install packages ****" && \ tar xf \ /tmp/bazarr.tar.gz -C \ /app/bazarr --strip-components=1 && \ + echo "**** Install requirements ****" && \ + pip install --no-cache-dir -U -r \ + /app/bazarr/requirements.txt && \ echo "**** fix backports warning in log ****" && \ if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ then \ touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ fi && \ + echo "**** clean up ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ + /root/.cache \ /tmp/* # add local files From 0bc8f50746632d4e81bea8d3ca08fe28a077d736 Mon Sep 17 00:00:00 2001 From: chbmb Date: Wed, 12 Jun 2019 02:10:49 +0100 Subject: [PATCH 062/438] Forgot libxslt-dev on arm files. Oooops --- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 16eb5b1..f982b15 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,6 +15,7 @@ RUN \ g++ \ gcc \ libxml2-dev \ + libxslt-dev \ python-dev && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ @@ -49,4 +50,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv +VOLUME /config /movies /tv \ No newline at end of file diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e42810b..09b0cfd 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,6 +15,7 @@ RUN \ g++ \ gcc \ libxml2-dev \ + libxslt-dev \ python-dev && \ echo "**** install bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ @@ -49,4 +50,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv +VOLUME /config /movies /tv \ No newline at end of file From 68f23d34c989dfc191873217ce370f8898594ba0 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 12 Jun 2019 14:57:18 -0700 Subject: [PATCH 063/438] rework of image down to base and install unrar/ffprobe for native functionality on arm, remove bins for app git app folder --- Dockerfile | 30 ++++++++++++++++++------------ Dockerfile.aarch64 | 32 +++++++++++++++++++------------- Dockerfile.armhf | 32 +++++++++++++++++++------------- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/30-config | 1 - 6 files changed, 58 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6701a67..0e90d13 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 @@ -12,11 +12,21 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ + g++ \ + gcc \ libxml2-dev \ libxslt-dev \ - python-dev && \ + py2-pip \ + python2-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + 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/releases/latest" \ @@ -30,19 +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 "**** fix backports warning in log ****" && \ - if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ - then \ - touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ - fi && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /root/.cache \ + /root/.cache \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f982b15..46906da 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 @@ -12,11 +12,21 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ + g++ \ + gcc \ libxml2-dev \ libxslt-dev \ - python-dev && \ + py2-pip \ + python2-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + 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/releases/latest" \ @@ -30,19 +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 "**** fix backports warning in log ****" && \ - if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ - then \ - touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ - fi && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /root/.cache \ + /root/.cache \ /tmp/* # add local files @@ -50,4 +56,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv \ No newline at end of file +VOLUME /config /movies /tv diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 09b0cfd..574a7e4 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 @@ -12,11 +12,21 @@ ENV TZ="Etc/UTC" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - g++ \ - gcc \ + g++ \ + gcc \ libxml2-dev \ libxslt-dev \ - python-dev && \ + py2-pip \ + python2-dev && \ + echo "**** install packages ****" && \ + apk add --no-cache \ + 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/releases/latest" \ @@ -30,19 +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 "**** fix backports warning in log ****" && \ - if [ ! -e /usr/lib/python2.7/site-packages/backports/__init__.py ]; \ - then \ - touch /usr/lib/python2.7/site-packages/backports/__init__.py ; \ - fi && \ + /app/bazarr/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /root/.cache \ + /root/.cache \ /tmp/* # add local files @@ -50,4 +56,4 @@ COPY root/ / # ports and volumes EXPOSE 6767 -VOLUME /config /movies /tv \ No newline at end of file +VOLUME /config /movies /tv diff --git a/README.md b/README.md index b601030..aa233c3 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. * **17.04.19:** - Add default UTC timezone if user does not set it. * **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 05ef18a..c12ab7f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,6 +44,7 @@ app_setup_block: | # changelog changelogs: + - { date: "12.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - { date: "17.04.19:", desc: "Add default UTC timezone if user does not set it." } - { 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 0b51bac06f181d66019b54482cddb7c6f24daae0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Jun 2019 22:45:11 +0100 Subject: [PATCH 064/438] 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 5d1049bfb8e3bbf11a2b78501bc8bf5d613521b9 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 065/438] Fix umask - get umask from environment Makes it consistent with other linuxserver.io images. --- readme-vars.yml | 2 ++ root/etc/services.d/bazarr/run | 3 +++ 2 files changed, 5 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index 05ef18a..83e0b17 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,6 +35,7 @@ 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"} + - { 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 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "17.04.19:", desc: "Add default UTC timezone if user does not set it." } - { 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/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 b7276d2083397d04fa52977ac32fd791e83c37a6 Mon Sep 17 00:00:00 2001 From: Mateusz Furdyna <17548441+SirFerdek@users.noreply.github.com> Date: Sun, 16 Jun 2019 23:20:21 +0200 Subject: [PATCH 066/438] Document UMASK_SET as optional --- README.md | 4 ++++ readme-vars.yml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index b601030..812229c 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. * **17.04.19:** - Add default UTC timezone if user does not set it. * **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 83e0b17..283c61a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,6 +35,9 @@ 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 From 63d6ec1dfbd99c22732518f69bac576ff17a46d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 Jun 2019 21:48:09 +0000 Subject: [PATCH 067/438] 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 dabb0a9e6c920ee7f589b5d7414b905f8c178dda Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 17:11:45 -0700 Subject: [PATCH 068/438] 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 0e90d13..b9035d6 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 46906da..d2e6e97 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 574a7e4..8d39e77 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 aabcfa3..0b1b5fb 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: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "12.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - { date: "17.04.19:", desc: "Add default UTC timezone if user does not set it." } From 812a5bb93864b839fb1d70570cf8430fa8c86d38 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 15:42:19 -0400 Subject: [PATCH 069/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f31e7db..4e40aa6 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. * **13.06.19:** - Add env variable for setting umask. * **12.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. * **17.04.19:** - Add default UTC timezone if user does not set it. From 69664879056e4dc22b690aa21464a3bbd2f78d20 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 21:44:59 +0100 Subject: [PATCH 070/438] 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 9be9f898aa15aa43c8a996650da9cc5749933c4a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jul 2019 22:38:50 +0100 Subject: [PATCH 071/438] Bot Updating Templated Files --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4e40aa6..813e028 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 580573391035e4c0f603f1720386a4950b00f9d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jul 2019 23:06:38 +0100 Subject: [PATCH 072/438] 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 422d47215246afce25d97a94a482c0dbc4334276 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Jul 2019 18:10:53 -0400 Subject: [PATCH 073/438] 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 08655e34f0ae2c68b609fcb88c0a875273d884b9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Jul 2019 23:12:06 +0100 Subject: [PATCH 074/438] 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 362cc23..e0c9b1e 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 From 146b69815a839f59c68012fc1b7e11bccddcd699 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 1 Aug 2019 22:04:27 +0000 Subject: [PATCH 075/438] 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 e0c9b1e..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 @@ -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 a14403df77cff023ea83d21a2fc93818417d3ee5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Aug 2019 22:08:11 +0000 Subject: [PATCH 076/438] 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 40b43d5..a6192a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,7 +55,7 @@ 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-1.1.22-r3 musl-utils-1.1.22-r2 ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 From c66a7168acb4c9bd298b57b4b1551ed53e64b418 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Aug 2019 18:17:32 -0400 Subject: [PATCH 077/438] 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 a6192a2..f980172 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -56,7 +56,7 @@ libxml2-2.9.9-r2 libxslt-1.1.33-r1 linux-pam-1.3.0-r1 musl-1.1.22-r3 -musl-utils-1.1.22-r2 +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 2372d9e229b200f8da1c9030949d500bfc2bedd4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 17 Aug 2019 17:45:40 +0200 Subject: [PATCH 078/438] 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 9fb69817e1f8249c8e897e20d4de08112ed2664e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Aug 2019 18:10:22 -0400 Subject: [PATCH 079/438] 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 81390464ed2d8409cb97ae18d757dd2d16242ba9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 29 Aug 2019 18:12:52 -0400 Subject: [PATCH 080/438] 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 4e702cdf095f3633a676e415e7ff5a4e4f070a89 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 22:38:53 +0100 Subject: [PATCH 081/438] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- README.md | 40 +++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d85ff9..782d297 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,6 +60,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( @@ -234,15 +242,18 @@ pipeline { 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 }')" ] || \ - [ "$(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 master 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 813e028..b4f5d51 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) +[![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) [Bazarr](https://www.bazarr.media/) 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 87c9b1308a7eb8c822973af8ac7183ebc63658d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 22:39:51 +0100 Subject: [PATCH 082/438] 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 c90a0209856529462c632c4392d56728e84b900a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Sep 2019 23:06:02 +0100 Subject: [PATCH 083/438] 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 df39803c1c6b466a83f178bcd1a56611a6f5bd9e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Sep 2019 18:10:47 -0400 Subject: [PATCH 084/438] 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 6d0d1ec..f022e56 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,8 +7,8 @@ busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 -curl-7.65.1-r0 -expat-2.2.7-r0 +curl-7.66.0-r0 +expat-2.2.7-r1 ffmpeg-4.1.4-r0 ffmpeg-libs-4.1.4-r0 fontconfig-2.13.1-r0 @@ -24,8 +24,8 @@ 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 -libcurl-7.65.1-r0 +libcrypto1.1-1.1.1d-r0 +libcurl-7.66.0-r0 libdrm-2.4.98-r0 libffi-3.2.1-r6 libgcc-8.3.0-r0 @@ -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 1aa9ecba039e209d961d5b3364d8691a35762742 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Sep 2019 18:12:14 -0400 Subject: [PATCH 085/438] 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 2cb6463adaebbf9dbcaa62f0c969983f75021bb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Oct 2019 16:20:52 -0400 Subject: [PATCH 086/438] Bot Updating Templated Files --- Jenkinsfile | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 782d297..be69ab5 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') @@ -52,22 +56,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( @@ -238,35 +227,32 @@ pipeline { 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 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 - 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 master - 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 master + 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 4fab4601e5e5559d7ec14502694e3fc17fa4d85e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Oct 2019 21:21:43 +0100 Subject: [PATCH 087/438] 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 8dff2ae89df461b1b918fefbdb4e4b78d2546df1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Oct 2019 22:57:06 +0100 Subject: [PATCH 088/438] 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 e1c591b96285c31f57a65c83ea86a505b9c71fbd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Oct 2019 23:57:24 +0200 Subject: [PATCH 089/438] 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 27b5fb431ce19b067d5e437ef8a6ae430b5cbb5b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Oct 2019 22:39:01 +0000 Subject: [PATCH 090/438] Bot Updating Templated Files --- Jenkinsfile | 162 +++++++++++++++++++++++++++++++++++++++------------- README.md | 16 ++++-- 2 files changed, 133 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index be69ab5..e26e69a 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 = 'master' EXT_USER = 'morpheus65535' EXT_REPO = 'bazarr' @@ -136,6 +138,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 { @@ -154,6 +159,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 { @@ -172,6 +180,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 { @@ -279,6 +290,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 ############### */ @@ -510,19 +541,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}:latest + docker push ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:${META_TAG} + done + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:latest || : + done ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" - sh "docker push ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest || :''' - } } } @@ -539,46 +583,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-latest" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" - 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-latest" - sh "docker push ${IMAGE}:arm32v7-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --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}:latest" - sh "docker manifest push --purge ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-latest \ - ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-latest \ - ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-latest \ + 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-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest + 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}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + sh '''#! /bin/bash + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:amd64-${META_TAG} \ + ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:arm32v7-${META_TAG} \ + ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm64v8-${META_TAG} \ + ${DELETEIMAGE}:arm64v8-latest || : + done + docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ''' } } } @@ -673,5 +752,8 @@ pipeline { } } } + cleanup { + cleanWs() + } } } diff --git a/README.md b/README.md index b4f5d51..0d20b27 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 775cc7864393c1a9c7d773a0f89099825c3886f0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Oct 2019 18:58:41 -0400 Subject: [PATCH 091/438] 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 494162f..627aa29 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 @@ -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 @@ -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 bee6d60fc94078de99d5b4cb5d73499c49a0bc79 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Nov 2019 17:43:06 -0500 Subject: [PATCH 092/438] 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 9b2d70b401b572a5cde6e704ef114cc17820e7ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Nov 2019 00:02:18 +0100 Subject: [PATCH 093/438] 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 996a0419dc96c1fd38438958ef77d93f899d41a8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Nov 2019 17:38:46 -0500 Subject: [PATCH 094/438] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- README.md | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e26e69a..314b837 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -627,7 +627,7 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest 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} @@ -741,12 +741,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 0d20b27..52de83b 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 649f3c526201695e8c72bf4894c51970909bbd9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 Dec 2019 18:02:31 -0500 Subject: [PATCH 095/438] 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..e4dcf93 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 bfe5296732b65469e2520c34977613383fd1b5ff Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 19 Dec 2019 16:15:11 -0800 Subject: [PATCH 096/438] 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 b9035d6..044a54c 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 d2e6e97..65619be 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 8d39e77..a19eeb5 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 0b1b5fb..30fc1e9 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: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "12.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } From 800b85f9a34320ab6567240a4de8ed89fe5f2d27 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 12:38:17 -0500 Subject: [PATCH 097/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 52de83b..a7220ba 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. * **13.06.19:** - Add env variable for setting umask. * **12.06.19:** - Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe. From 46d018ce66a55bd3c46f3da2880f8e2c57737a57 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 13:03:16 -0500 Subject: [PATCH 098/438] 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 e4dcf93..1c21404 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 -python2-2.7.16-r1 -readline-8.0.0-r0 -scanelf-1.2.3-r0 +p11-kit-0.23.18.1-r0 +python2-2.7.16-r3 +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 d8564418440d82bbad37bd02fa617dc7c858dbc5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Dec 2019 22:57:47 +0000 Subject: [PATCH 099/438] 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 1c21404..6ba78b4 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 @@ -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 @@ python2-2.7.16-r3 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 518660cb275723414afe407d28f636bbe8d10502 Mon Sep 17 00:00:00 2001 From: chbmb Date: Sat, 28 Dec 2019 08:26:58 +0000 Subject: [PATCH 100/438] Upgrade to Python 3 --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Dockerfile.armhf | 4 ++-- README.md | 1 + readme-vars.yml | 1 + root/etc/services.d/bazarr/run | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 044a54c..30c34a8 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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 65619be..e298407 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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a19eeb5..9a8ca1a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -17,14 +17,14 @@ RUN \ 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 ****" && \ diff --git a/README.md b/README.md index a7220ba..2902edf 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 +* **28.12.19:** - Upgrade to Python 3. * **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. * **13.06.19:** - Add env variable for setting umask. diff --git a/readme-vars.yml b/readme-vars.yml index 30fc1e9..af37dd8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "28.12.19"}, desc: "Upgrade to Python 3." - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } 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 19b848625032dac3793dc58bfe238116ada02d2e Mon Sep 17 00:00:00 2001 From: chbmb Date: Sat, 28 Dec 2019 08:39:50 +0000 Subject: [PATCH 101/438] Forgot pip3 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30c34a8..f34b5f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,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 e298407..03cf596 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,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 9a8ca1a..639cd3f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -42,7 +42,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 \ From 315c4725c67a15c9d46265ee8a5e2918f0efaa19 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 30 Dec 2019 15:22:40 -0800 Subject: [PATCH 102/438] fix typo --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2902edf..35c535b 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **28.12.19:** - Upgrade to Python 3. +* **28.12.19** - Upgrade to Python 3. * **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. * **13.06.19:** - Add env variable for setting umask. diff --git a/readme-vars.yml b/readme-vars.yml index af37dd8..7967795 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,7 +48,7 @@ app_setup_block: | # changelog changelogs: - - { date: "28.12.19"}, desc: "Upgrade to Python 3." + - { date: "28.12.19", desc: "Upgrade to Python 3." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } From 4cae73af67e032303a3dee4f48e2f36e1c697fc2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 30 Dec 2019 23:38:06 +0000 Subject: [PATCH 103/438] 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 6ba78b4..c2536d2 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 -python2-2.7.16-r3 +python3-3.8.0-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 From 4558d2898510af23ef56ff4469eb5f5c17de6b06 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 Jan 2020 17:53:52 -0500 Subject: [PATCH 104/438] 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 6265de5bc7fb947d2705e4f9f16ff658ec5df8de Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Jan 2020 17:56:23 -0500 Subject: [PATCH 105/438] 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 0898da155f66c5016d396fd4d0308dd6e16b018b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jan 2020 22:54:42 +0000 Subject: [PATCH 106/438] 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 f837c69c5e652d549065b8f18aa2c3249b818929 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Feb 2020 23:02:20 +0000 Subject: [PATCH 107/438] 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 c79814998150ec54aa26b53b7a735d84abf6df8c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Feb 2020 22:56:58 +0000 Subject: [PATCH 108/438] 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 200be4e9e213e259b31437b3b76c901b20f0e320 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Feb 2020 22:56:25 +0000 Subject: [PATCH 109/438] 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 51a7924..562d24d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,9 +57,8 @@ 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 From ca3fda958c637266f4897495db1b4d2c912b824e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 29 Feb 2020 18:34:51 -0500 Subject: [PATCH 110/438] 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 562d24d..ba539d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,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.1-r0 +python3-3.8.2-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 sdl2-2.0.10-r0 From 5885284915e517ef9cee904018363f08e81e42a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Mar 2020 22:57:46 +0000 Subject: [PATCH 111/438] 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 ba539d5..3f3e0fb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,8 +55,8 @@ 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-utils-1.1.24-r0 +musl-1.1.24-r1 +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 63e03f88ffd2e8e36e99e4bfe5a47b79f90ebbd1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Mar 2020 18:53:46 -0400 Subject: [PATCH 112/438] 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 3f3e0fb..e5328eb 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 @@ -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,8 +55,8 @@ 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-utils-1.1.24-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 nettle-3.5.1-r0 @@ -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 46440b5612a2576b0265b228ddbb528cf77d2e26 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 Apr 2020 17:57:57 -0400 Subject: [PATCH 113/438] 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 e5328eb..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 @@ -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 bf331f63163735bb51ec81edb8c6eab29f249317 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 8 Apr 2020 10:20:04 -0500 Subject: [PATCH 114/438] Removed /downloads and /music volumes from Dockerfiles --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.armhf | 6 +++--- readme-vars.yml | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f34b5f5..1faa213 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 03cf596..71727eb 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 639cd3f..909af7f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -23,7 +23,7 @@ RUN \ curl \ ffmpeg \ libxml2 \ - libxslt \ + libxslt \ python3 \ unrar \ unzip && \ @@ -43,7 +43,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 && \ @@ -56,4 +56,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 7967795..6cf021f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,7 +48,8 @@ app_setup_block: | # changelog changelogs: - - { date: "28.12.19", desc: "Upgrade to Python 3." } + - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } + - { date: "28.12.19:", desc: "Upgrade to Python 3." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } From f1923845eb75375a1805bc7c7cc45a78400039fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Apr 2020 22:38:58 +0100 Subject: [PATCH 115/438] Bot Updating Templated Files --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 35c535b..930733c 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 4a5eed9d6da195813746fb6e3665680d4680d64e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Apr 2020 22:52:05 +0100 Subject: [PATCH 116/438] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 930733c..56bfd01 100644 --- a/README.md +++ b/README.md @@ -225,7 +225,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **28.12.19** - Upgrade to Python 3. +* **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. +* **28.12.19:** - Upgrade to Python 3. * **19.12.19:** - Rebasing to alpine 3.11. * **28.06.19:** - Rebasing to alpine 3.10. * **13.06.19:** - Add env variable for setting umask. From 32184cb0881baa3704c784a49fb93cad135afa57 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Apr 2020 21:53:12 +0000 Subject: [PATCH 117/438] 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 14c459d43fae7ab0d1e4058e7ec48ce05fab22c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Apr 2020 21:39:46 +0000 Subject: [PATCH 118/438] 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 314b837..3978c00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -357,7 +357,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} || :''' @@ -384,7 +386,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} || :''' @@ -549,18 +553,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}:latest + docker push ${PUSHIMAGE}:latest + 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}:latest - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ @@ -591,59 +599,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-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest - 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}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - 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-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest + 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}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + } sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ From 6b909e35241fa29b764f01893add29c8908fdf2e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Apr 2020 21:55:33 +0000 Subject: [PATCH 119/438] 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 68ade62..df5fecb 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 @@ -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 41e350dc0d5111ac8b337975f208556bdebfde19 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 May 2020 21:59:06 +0000 Subject: [PATCH 120/438] 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 df5fecb..004b6c8 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 @@ -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 c1d7947ce1d06125f090495c0fef892dc3200f97 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 13 May 2020 16:16:40 -0400 Subject: [PATCH 121/438] 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 3978c00..0a77f84 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/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 56bfd01..1be4c6f 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 Github sponsors button and container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. * **28.12.19:** - Upgrade to Python 3. * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 528d8af..21c37dd 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -27,3 +27,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 6cf021f..107e8e6 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 Github sponsors button and container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - { date: "28.12.19:", desc: "Upgrade to Python 3." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } 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 c298f98dfc46f68c56ffcd22c52e0efd6ddeaead Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 20 May 2020 12:54:23 -0500 Subject: [PATCH 122/438] Remove Bazarr Beerpay link 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 21c37dd..cc58870 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -28,5 +28,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 7bf522452cd1e9a2f6bfc7f960349243544dbcaf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 20 May 2020 23:16:32 +0000 Subject: [PATCH 123/438] 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 653eaa98378e91db48f4560a0fc2a279114a013b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 May 2020 21:38:53 +0000 Subject: [PATCH 124/438] Bot Updating Templated Files --- Jenkinsfile | 53 +++++++++++++++++------------------------------------ README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a77f84..71b1e85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,7 +138,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') { @@ -159,7 +158,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') { @@ -180,7 +178,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') { @@ -545,22 +542,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}:latest docker push ${PUSHIMAGE}:latest @@ -569,7 +559,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}:latest || : @@ -591,18 +581,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 @@ -636,26 +619,24 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest 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}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - 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}:latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:amd64-${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker push ${GITHUBIMAGE}:latest + docker push ${GITHUBIMAGE}:${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-latest + docker push ${GITHUBIMAGE}:arm64v8-latest ''' } 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-latest \ diff --git a/README.md b/README.md index 1be4c6f..7afa7e7 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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) +[![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://www.bazarr.media/) 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 12a3b8e3da383f622585d151739d68ee50d24cd3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 May 2020 21:59:04 +0000 Subject: [PATCH 125/438] 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 448cab50e37ca144642c3e81c2deb93dab5e9abf Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 1 Jun 2020 17:52:11 -0500 Subject: [PATCH 126/438] Rebasing to alpine 3.12. --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 4 ++-- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1faa213..184336b 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 71727eb..e7cd927 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 909af7f..8682861 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,7 +16,7 @@ RUN \ gcc \ libxml2-dev \ libxslt-dev \ - py2-pip \ + py3-pip \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ diff --git a/README.md b/README.md index 7afa7e7..3cfc22a 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 +* **01.06.20:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to Github sponsors button and container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. * **28.12.19:** - Upgrade to Python 3. diff --git a/readme-vars.yml b/readme-vars.yml index 107e8e6..7c49094 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -48,6 +48,7 @@ app_setup_block: | # changelog changelogs: + - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to Github sponsors button and container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - { date: "28.12.19:", desc: "Upgrade to Python 3." } From 145de52871b66a20ac5a4637929db26d1ba5d882 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 17:38:50 -0400 Subject: [PATCH 127/438] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7afa7e7..34e2159 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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) -[![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://www.bazarr.media/) 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 567ebcf8b9265f84e2ff2dcba32e1b352acab8ca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Jun 2020 17:59:27 -0400 Subject: [PATCH 128/438] 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 adc860825b726be5baf473cb8bc954431886c1e3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Jun 2020 12:36:52 -0400 Subject: [PATCH 129/438] 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 7d7a26c7beb95985dbce7e86860da9eddd7ef290 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Jun 2020 22:22:44 +0000 Subject: [PATCH 130/438] 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 158ad0282dd855aa15877148ac6aa9994470dfa0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Jun 2020 22:24:15 +0000 Subject: [PATCH 131/438] 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 a807929ea93fd447a9b3b533b5e42eeb9d38253a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Jun 2020 18:04:09 -0400 Subject: [PATCH 132/438] 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 a9c468c..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 @@ -61,8 +61,8 @@ 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-utils-1.1.24-r8 +musl-1.1.24-r9 +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 cadc34fe1da28391d78be31caa0e0ebf2ee95251 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jul 2020 18:18:45 -0400 Subject: [PATCH 133/438] 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 97ced93195929e7115285538107a05aa4e97b998 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Jul 2020 18:03:48 -0400 Subject: [PATCH 134/438] 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..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.3-r0 +python3-3.8.5-r0 readline-8.0.4-r0 scanelf-1.2.6-r0 sdl2-2.0.12-r1 From 6e66bb8d539eb1ee144ee546771f2c47e10570fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Aug 2020 21:38:55 +0000 Subject: [PATCH 135/438] Bot Updating Templated Files --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 71b1e85..3aac953 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/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( @@ -244,7 +244,7 @@ pipeline { cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master 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} @@ -698,6 +698,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=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ @@ -705,7 +709,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 d3ea78f4fe15999435367c5ab1fa775df58c60fe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 6 Aug 2020 21:40:11 +0000 Subject: [PATCH 136/438] 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 ee546ced5acb68c22ee0bf6cc4446d61ca256752 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Aug 2020 00:05:35 +0000 Subject: [PATCH 137/438] 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 ef87af3ac4cd10bc82ab1ef77d13f53908766a1b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Aug 2020 01:29:29 +0000 Subject: [PATCH 138/438] 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 80c78d73145094461f5e92b48e85017c0c5fb19a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Aug 2020 21:39:20 +0000 Subject: [PATCH 139/438] 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 5cf05bef7ba3c1ada8fd653daef8870797126b37 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Aug 2020 22:38:06 +0000 Subject: [PATCH 140/438] 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 af3982b8ca51b9f091c2a0c0dd370dc802bab3b9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Sep 2020 06:14:51 +0100 Subject: [PATCH 141/438] 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 02a69d12e9fc86055a01cbcf07bf2e6401666477 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Sep 2020 23:36:23 +0100 Subject: [PATCH 142/438] 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 10f63a6..4d38026 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 @@ -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 @@ -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 61baa423d61bd23fd544323eaf075087c6ea4cbd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Sep 2020 22:34:43 +0000 Subject: [PATCH 143/438] 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 b4dee4d36a2a11ba462ebe444e46b0aa5edab179 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Oct 2020 00:20:16 +0000 Subject: [PATCH 144/438] 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 3aac953..57d9025 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/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( @@ -146,6 +146,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 } } } @@ -166,6 +167,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/' } } @@ -186,6 +188,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/' } @@ -553,8 +556,10 @@ pipeline { for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} done ''' } @@ -562,6 +567,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:latest || : done ''' @@ -602,12 +608,18 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + 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-latest docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm64v8-latest + 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}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -616,8 +628,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}:latest 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} @@ -626,6 +642,10 @@ pipeline { docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + 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} @@ -633,6 +653,10 @@ pipeline { docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-latest docker push ${GITHUBIMAGE}:arm64v8-latest + 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 @@ -701,7 +725,7 @@ pipeline { 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="${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 d4d1fd2..0e1a9c7 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 :/tv \ - --restart unless-stopped \ - 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 +### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) Compatible with docker-compose v2 schemas. -``` +```yaml --- version: "2.1" services: @@ -106,6 +86,29 @@ services: restart: unless-stopped ``` +### docker cli + +``` +docker run -d \ + --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 :/tv \ + --restart unless-stopped \ + 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 !!!!!!!!! + + ## 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. @@ -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 02b6147b912506bd33003f99d19ae210145628fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Oct 2020 01:22:04 +0100 Subject: [PATCH 145/438] 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 a3d2f5294f7174cd0c89c008548d055e6594ed95 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Oct 2020 04:15:25 +0100 Subject: [PATCH 146/438] 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 9e6f2a4aedc221e5c775f928fdc0f702fe38edac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Oct 2020 22:35:58 +0000 Subject: [PATCH 147/438] 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 9469184a0a1555ee3c17116ad53ac6e2bc6a5ebd Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 2 Nov 2020 07:06:22 -0800 Subject: [PATCH 148/438] update baseimages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 184336b..a86835e 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 e7cd927..f08eb58 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 8682861..5e14b77 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 6f5cf0fb41a4614613cf5181ab85687010fb9a7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 15:10:02 +0000 Subject: [PATCH 149/438] Bot Updating Templated Files --- Jenkinsfile | 162 ++++++++++++++++++++-------------------------------- README.md | 14 ++--- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57d9025..b7e0f3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,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}':latest 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}':latest 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' ''', @@ -138,7 +138,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 @@ -159,7 +159,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 @@ -180,7 +180,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 @@ -201,24 +201,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''' } } @@ -236,8 +236,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=master -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=master -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) @@ -342,28 +342,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') { @@ -371,28 +362,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} || :''' } } } @@ -491,20 +473,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 \ @@ -516,15 +498,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''' } } @@ -551,7 +533,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} @@ -593,15 +575,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} @@ -635,28 +617,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}:latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest - 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}:latest - docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-latest - docker push ${GITHUBIMAGE}:arm64v8-latest - 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 @@ -670,8 +630,8 @@ pipeline { ${DELETEIMAGE}:arm64v8-latest || : 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} || : ''' } } @@ -724,9 +684,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 \ @@ -734,7 +694,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 0e1a9c7..86e2499 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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) -[![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://www.bazarr.media/) 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 :/tv \ --restart unless-stopped \ - linuxserver/bazarr + ghcr.io/linuxserver/bazarr ``` You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch. @@ -175,7 +175,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * 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` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/bazarr` ## Updating Info @@ -191,7 +191,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 linuxserver/bazarr` +* Update the image: `docker pull ghcr.io/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) @@ -221,7 +221,7 @@ cd docker-bazarr docker build \ --no-cache \ --pull \ - -t linuxserver/bazarr:latest . + -t ghcr.io/linuxserver/bazarr:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 33cd38f068740d88e0c0347269c61046334e21bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 15:40:44 +0000 Subject: [PATCH 150/438] 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 899034de84ebe15333a60e10529bf90c2ccb41f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 Nov 2020 03:16:26 +0000 Subject: [PATCH 151/438] 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 62ac7f10f5acdb5cb189aef71e6379b4c8710e33 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Nov 2020 23:36:42 +0000 Subject: [PATCH 152/438] 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 7fe67ce518017cffd757f72556a0468149d7a276 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Dec 2020 23:36:11 +0000 Subject: [PATCH 153/438] 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 ca1494db772622c17f29be644a01e58843421663 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 19:34:02 +0000 Subject: [PATCH 154/438] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 ------------------------------------- Jenkinsfile | 30 ++++++++++++++++++++++-------- README.md | 2 +- 3 files changed, 23 insertions(+), 46 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 b7e0f3a..5875e3b 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.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( @@ -145,6 +145,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } + env.VERSION_TAG = 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 } @@ -166,6 +167,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } + env.VERSION_TAG = 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/' @@ -187,6 +189,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } + env.VERSION_TAG = 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 @@ -248,9 +251,12 @@ pipeline { git checkout -f master 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} @@ -320,8 +326,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 @@ -333,8 +340,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') { @@ -342,12 +350,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}" @@ -362,12 +371,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}" @@ -610,6 +620,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 @@ -624,10 +635,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-latest \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -694,7 +708,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 86e2499..6dc8371 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 d9434f9532b4448ab7a65b99ed5601d5bf310510 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 14:36:47 -0500 Subject: [PATCH 155/438] 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..56f1859 --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,90 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/morpheus65535/bazarr/releases/latest" | jq -r '. | .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 master" + 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="latest" + 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 latest" + 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/master/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/master/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 latest. 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..87705db --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/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 master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/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 80e30b2f60881688043d20400ca3035d641574b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 20:37:18 +0000 Subject: [PATCH 156/438] 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 a6bfd60..a41d666 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 @@ -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 acab5089161dd0131ade25349b21e3338de29070 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 15 Dec 2020 18:53:10 -0600 Subject: [PATCH 157/438] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5875e3b..ff24624 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -252,11 +252,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 a361e1212cb9ead871d0633ccfb8b5398992ca19 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Dec 2020 00:55:48 +0000 Subject: [PATCH 158/438] 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 56f1859..574e54e 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 ff24624..db02033 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -450,6 +450,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' } @@ -467,6 +474,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' } @@ -556,7 +570,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 e24454454532168c459d184b39d375558d827dd1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 23:18:45 -0500 Subject: [PATCH 159/438] 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 574e54e..10493eb 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 master" + 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 db02033..b920289 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -265,13 +265,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 f4fd7cc60dd9ae1bdf613293de850faf00f4d401 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 23:51:06 -0500 Subject: [PATCH 160/438] 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 21eba5bd05fa5711c1e8b97752879de9e7f574c7 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sat, 23 Jan 2021 13:42:57 +0100 Subject: [PATCH 161/438] 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 6dc8371..d3d8f9c 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. * **01.06.20:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to Github sponsors button and container log. * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles. diff --git a/readme-vars.yml b/readme-vars.yml index 7c49094..aa2fd3b 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: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to Github sponsors button and 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 f4ddf2b1a07a607e5008b2dbfed18675261cc00c Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Jan 2021 12:02:32 -0800 Subject: [PATCH 162/438] 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 a86835e..1c70613 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 f08eb58..94509fc 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 5e14b77..7d7454e 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 7c49094..9ce7ed6 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: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "13.05.20:", desc: "Add donation links for Bazarr to Github sponsors button and container log." } - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } From 3413ca5872a9e8d04b9161ebe5c56b3973dce087 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 16:43:49 +0000 Subject: [PATCH 163/438] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- README.md | 1 + 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b920289..f0e38de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -241,10 +241,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -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 master + 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 master + 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} @@ -252,11 +295,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} @@ -265,8 +310,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' @@ -276,13 +321,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' @@ -522,7 +567,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} @@ -547,7 +592,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''' } } @@ -692,9 +737,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 master",\ "type": "commit",\ @@ -702,9 +747,9 @@ pipeline { 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 - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ - "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": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done @@ -731,7 +776,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 \ @@ -739,7 +784,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 d3d8f9c..af4a951 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. * **01.06.20:** - Rebasing to alpine 3.12. * **13.05.20:** - Add donation links for Bazarr to Github sponsors button and container log. From e5090d1d601f2c70a2c3caba1853c7a8fe0082b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 16:45:23 +0000 Subject: [PATCH 164/438] 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 82f64b3a45f8175f108b18dad26a956ef8765132 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Feb 2021 12:49:53 -0500 Subject: [PATCH 165/438] Bot Updating Package Versions --- package_versions.txt | 124 ++++++++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 55 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cfa7528..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 -tzdata-2020f-r0 -unrar-5.9.2-r0 +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-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 ac27c888131fe1cdd00cb667c2e4b0123c331f44 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Feb 2021 00:37:51 -0500 Subject: [PATCH 166/438] 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 7efe8dd..8c4d211 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 @@ -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 @@ -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 9f487a9d8a9a003bbc61f347678f86191c5d1b15 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Feb 2021 12:21:46 -0500 Subject: [PATCH 167/438] 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 a72b2c155d21a84b2a72cd4644ade9807d8567fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 7 Mar 2021 05:39:31 +0000 Subject: [PATCH 168/438] 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 4e3db2354558cf4afd35dcacc3dc8fd389dfad3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Mar 2021 00:40:26 -0500 Subject: [PATCH 169/438] 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 50d98f6..31de02d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,9 +17,9 @@ 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 +gnutls-3.7.1-r0 graphite2-1.3.14-r0 harfbuzz-2.7.4-r1 lame-3.100-r0 From d1ca102afcefc3763fa29af70458887ad63979d4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Mar 2021 01:42:24 -0400 Subject: [PATCH 170/438] 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 5f77a6f5e46bb0a27fc7a2e54c5d9d276258f2bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Apr 2021 05:47:15 +0000 Subject: [PATCH 171/438] 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 f2a513380dc6c4ab7e982d589cfcb28df96e807c Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Apr 2021 16:53:20 -0400 Subject: [PATCH 172/438] move app to /app/bazarr/bin, add package_info --- Dockerfile | 9 +++++---- Dockerfile.aarch64 | 9 +++++---- Dockerfile.armhf | 9 +++++---- README.md | 26 +++++++++++++++----------- readme-vars.yml | 22 +++++++++++----------- root/etc/services.d/bazarr/run | 2 +- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c70613..7e0af78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,14 +36,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=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/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 94509fc..00c0302 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -36,14 +36,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=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/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7d7454e..39ea883 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -36,14 +36,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=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/requirements.txt && \ + /app/bazarr/bin/requirements.txt && \ echo "**** clean up ****" && \ apk del --purge \ build-dependencies && \ diff --git a/README.md b/README.md index af4a951..c60817f 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,14 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable releases from Bazarr | +| development | Pre-releases from Bazarr | ## Usage @@ -77,9 +85,9 @@ services: - PGID=1000 - TZ=Europe/London volumes: - - :/config - - :/movies - - :/tv + - /path/to/bazarr/config:/config + - /path/to/movies:/movies #optional + - /path/to/tv:/tv #optional ports: - 6767:6767 restart: unless-stopped @@ -94,18 +102,13 @@ docker run -d \ -e PGID=1000 \ -e TZ=Europe/London \ -p 6767:6767 \ - -v :/config \ - -v :/movies \ - -v :/tv \ + -v /path/to/bazarr/config:/config \ + -v /path/to/movies:/movies `#optional` \ + -v /path/to/tv:/tv `#optional` \ --restart unless-stopped \ ghcr.io/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 !!!!!!!!! - ## Parameters @@ -230,6 +233,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.04.21:** - Move app to /app/bazarr/bin, add `package_info`. * **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. * **01.06.20:** - Rebasing to alpine 3.12. diff --git a/readme-vars.yml b/readme-vars.yml index b8dae40..d0fd0b8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -13,22 +13,17 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v7-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 !!!!!!!!! + # development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable releases from Bazarr" } + - { tag: "development", desc: "Pre-releases from Bazarr" } # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Bazarr data" } - - { vol_path: "/movies", vol_host_path: "", desc: "Location of your movies" } - - { vol_path: "/tv", vol_host_path: "", desc: "Location of your TV Shows" } + - { vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data" } param_usage_include_ports: true param_ports: - { external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver." } @@ -37,6 +32,10 @@ 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 +opt_param_usage_include_vols: true +opt_param_volumes: + - { 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" } # application setup block app_setup_block_enabled: true @@ -46,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin, add `package_info`." } - { 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: "01.06.20:", desc: "Rebasing to alpine 3.12." } 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 53d9a110bff1ae00fbca1c582d92e9c426fe5a67 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Apr 2021 00:13:56 +0100 Subject: [PATCH 173/438] 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 757007b1a68e8fb6755e70cd3bdc62665833e2c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 00:44:56 -0400 Subject: [PATCH 174/438] Bot Updating Templated Files --- Jenkinsfile | 92 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0e38de..dfe5659 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/latest | jq -r '. | .tag_name' ''', + script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "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": false}' >> 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 098e47dc587a298e590311e6ed8af6e2c7bc7e07 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 00:46:15 -0400 Subject: [PATCH 175/438] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 7 +++--- README.md | 49 +++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4e69847..08246a6 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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,13 +106,14 @@ 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 diff --git a/README.md b/README.md index c60817f..57e128f 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. @@ -65,6 +66,11 @@ This image provides various versions that are available via tags. `latest` tag u | latest | Stable releases from Bazarr | | development | Pre-releases from Bazarr | +## 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 Here are some example snippets to help you get started creating a container. @@ -95,7 +101,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=bazarr \ -e PUID=1000 \ @@ -109,7 +115,6 @@ docker run -d \ ghcr.io/linuxserver/bazarr ``` - ## 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. @@ -130,7 +135,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 ``` @@ -149,25 +154,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` @@ -184,6 +181,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` @@ -191,6 +189,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` @@ -198,24 +197,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 \ @@ -225,7 +229,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 c35f44e049e5eb979ab0052a3a5b32b3d1bb8a42 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 06:47:04 +0100 Subject: [PATCH 176/438] 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 f3279c9..c1ba41a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,14 +2,14 @@ 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 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 @@ -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 d329070de1a2981d1d274913a5b3c4c7f6c604f0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 19 Apr 2021 11:17:30 -0400 Subject: [PATCH 177/438] install from zip --- Dockerfile | 82 +++++++++++++++++----------------- Dockerfile.aarch64 | 82 +++++++++++++++++----------------- Dockerfile.armhf | 82 +++++++++++++++++----------------- 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(+), 128 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e0af78..9203090 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,47 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - 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=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/* + 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/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + 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 00c0302..086599c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,47 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - 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=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/* + 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/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + 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 39ea883..137a161 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -10,47 +10,47 @@ LABEL maintainer="chbmb" ENV TZ="Etc/UTC" RUN \ - 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - 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=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/* + 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/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + 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 57e128f..c946243 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,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, add `package_info`. * **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 d0fd0b8..2a3114e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,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, add `package_info`." } - { 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/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 4495cdfc43bc17aca4eedfbe982f0c50121169cd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Apr 2021 06:47:42 +0100 Subject: [PATCH 178/438] 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 c1ba41a..1fd7c00 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 @@ -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 @@ -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 @@ -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 f1c20f9306b500ef72b97e5f39161fa0dfce07b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 8 May 2021 16:30:04 +0000 Subject: [PATCH 179/438] 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 15cde74f3ed57da33a80d861794540af4e7f9627 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sun, 9 May 2021 15:32:27 +0200 Subject: [PATCH 180/438] Update requirements to reflect uppcomming changes --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- Dockerfile.armhf | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9203090..20741a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,13 @@ 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 \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -24,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 086599c..59a7c6b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,11 +12,13 @@ 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 \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -24,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 137a161..79a4322 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,11 +12,13 @@ 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 \ python3-dev && \ echo "**** install packages ****" && \ apk add --no-cache \ @@ -24,6 +26,7 @@ RUN \ ffmpeg \ libxml2 \ libxslt \ + py3-pip \ python3 \ unrar \ unzip && \ From eca075606024556c6aed008c7aa94a8b8084685a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 9 May 2021 16:39:57 -0400 Subject: [PATCH 181/438] 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 f76c17e9d5f4ae37483578c084bc1c450f945e1a Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sun, 16 May 2021 20:39:34 +0200 Subject: [PATCH 182/438] Use prebuilt wheels --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- Dockerfile.armhf | 5 ++++- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20741a6..2259ee6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ + cargo \ g++ \ gcc \ jq \ @@ -46,13 +47,15 @@ RUN \ 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 \ + pip3 install -U --no-cache-dir pip && \ + pip 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 \ build-dependencies && \ rm -rf \ /root/.cache \ + /root/.cargo \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 59a7c6b..1a47b42 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,6 +13,7 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ + cargo \ g++ \ gcc \ jq \ @@ -46,13 +47,15 @@ RUN \ 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 \ + pip3 install -U --no-cache-dir pip && \ + pip 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 \ build-dependencies && \ rm -rf \ /root/.cache \ + /root/.cargo \ /tmp/* # add local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 79a4322..2c3b7ae 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -13,6 +13,7 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ + cargo \ g++ \ gcc \ jq \ @@ -46,13 +47,15 @@ RUN \ 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 \ + pip3 install -U --no-cache-dir pip && \ + pip 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 \ build-dependencies && \ rm -rf \ /root/.cache \ + /root/.cargo \ /tmp/* # add local files diff --git a/README.md b/README.md index c946243..ee587df 100644 --- a/README.md +++ b/README.md @@ -238,6 +238,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, add `package_info`. * **23.01.21:** - Rebasing to alpine 3.13. diff --git a/readme-vars.yml b/readme-vars.yml index 2a3114e..f406b70 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,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, add `package_info`." } - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } From 759eb9ae3cddb4b3b52762ad9a87a191ccf19dc2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 May 2021 05:05:46 +0000 Subject: [PATCH 183/438] 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 6dac744611d6c408fee02f55cc110178a864547c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 May 2021 02:12:28 -0400 Subject: [PATCH 184/438] 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 9a0fcd8ce1be4cad6ba64268ea7880d2ccecabdf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Jun 2021 05:52:00 +0000 Subject: [PATCH 185/438] 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 213d542..98dc521 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 @@ -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 2443639f48b90c7c38656e819c0521bdef6d22c9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Jun 2021 04:50:06 +0000 Subject: [PATCH 186/438] 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 98dc521..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 @@ -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 3ebd6caa378093b5702d0fb54f8e1391bfea7fd7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Jun 2021 04:51:16 +0000 Subject: [PATCH 187/438] 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 10f9abeff5ac527de61d8b37c8dfea5be00d52d5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jul 2021 04:41:34 +0000 Subject: [PATCH 188/438] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfe5659..70c75e6 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 master - 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 ee159deea7921bd0e0a1129b4bbe9069b9afd7be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jul 2021 04:43:22 +0000 Subject: [PATCH 189/438] 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 08246a6..424ab22 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 422815d..f07873a 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 ee587df..da76943 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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) @@ -75,9 +74,7 @@ This image provides various versions that are available via tags. `latest` tag u 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 --- @@ -99,7 +96,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 02f4ae3c53a75364f403ec0c5f3a626e066852f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jul 2021 04:57:26 +0000 Subject: [PATCH 190/438] 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 dd81f07b4c781e3fffe0b50025500e951cb40918 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Jul 2021 06:44:19 +0200 Subject: [PATCH 191/438] 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 c6fa45552029bb538e425809d64c178c387af004 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 8 Aug 2021 06:44:24 +0200 Subject: [PATCH 192/438] 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 e74500afefed21007c172e6874f84117beec1f26 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Aug 2021 15:11:10 +0200 Subject: [PATCH 193/438] 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 86857727fa82930b1563b3326f8c763014621026 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 29 Aug 2021 06:41:46 +0200 Subject: [PATCH 194/438] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 70c75e6..7a4b52b 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 { @@ -515,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} @@ -576,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} @@ -600,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 fc1a8c9775bca645a22521ce6239e7c979175091 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 19:22:36 +0200 Subject: [PATCH 195/438] 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 12b1e5c714bb3d94c41b627958d5b89bae5fa191 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Sep 2021 06:41:43 +0200 Subject: [PATCH 196/438] 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 d767814..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,12 +31,12 @@ 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 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 @@ -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 4391bd6a9e967123eb3d1c22c3fa1ad8871a5751 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 26 Sep 2021 06:42:07 +0200 Subject: [PATCH 197/438] 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 25ccac7b66388148e2b99060b9a2f7646afe03d3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 06:40:28 +0200 Subject: [PATCH 198/438] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a4b52b..9fb5abb 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 = 'master' 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-' + 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 { @@ -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-' + 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 { @@ -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-' + 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 { @@ -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 "master" + 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}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:latest 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}:latest || : + ${DELETEIMAGE}:latest \ + ${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}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --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}:latest 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-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${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 8f20997bd800e265acdce7a4edb285396439c548 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 06:41:38 +0200 Subject: [PATCH 199/438] Bot Updating Templated Files --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index da76943..4dbf2a8 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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/) @@ -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: @@ -81,7 +82,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 @@ -109,7 +110,7 @@ docker run -d \ -v /path/to/movies:/movies `#optional` \ -v /path/to/tv:/tv `#optional` \ --restart unless-stopped \ - ghcr.io/linuxserver/bazarr + lscr.io/linuxserver/bazarr ``` ## Parameters @@ -169,7 +170,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bazarr` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/bazarr` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bazarr` ## Updating Info @@ -187,7 +188,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull ghcr.io/linuxserver/bazarr` +* Update the image: `docker pull lscr.io/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) @@ -222,7 +223,7 @@ cd docker-bazarr docker build \ --no-cache \ --pull \ - -t ghcr.io/linuxserver/bazarr:latest . + -t lscr.io/linuxserver/bazarr:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 970fa473ccb97d5c8b4ca54f511774603792e300 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 07:00:53 +0200 Subject: [PATCH 200/438] 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 07c79854f98404a67ea93f21792ce06bb581a590 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Oct 2021 06:41:53 +0200 Subject: [PATCH 201/438] 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 6ef1615a30dd531870087953e49180169e419210 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 06:42:02 +0200 Subject: [PATCH 202/438] 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 2ce61b00189230b8cc0cd5efcb566f2894b2242f Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 24 Oct 2021 12:02:44 +0100 Subject: [PATCH 203/438] Fix missing numpy dep --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + readme-vars.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2259ee6..bd96b4e 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 1a47b42..d3a6c44 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 2c3b7ae..e58ce52 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 f406b70..91512fc 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,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, add `package_info`." } From b634717905639448819be2408e54bfeae279c5e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 14:45:48 +0200 Subject: [PATCH 204/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4dbf2a8..b2220a2 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,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, add `package_info`. From cb55ae0f4d99bcc39c0e544e1d95f277a6907e81 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 14:50:17 +0200 Subject: [PATCH 205/438] 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 a84ea388fbb7e4cf06dfb89846823eb2a50fb252 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 25 Oct 2021 15:43:15 -0400 Subject: [PATCH 206/438] 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 bd96b4e..73278c5 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 d3a6c44..8756a6f 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 e58ce52..7b8c268 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 b2220a2..6efcb97 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,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 91512fc..ec07456 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,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 b59cd642fdca28acced4f1fa17443a784bab45d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 26 Oct 2021 13:57:23 +0200 Subject: [PATCH 207/438] 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 43973ff17776ab9da2c58b5d3cc9b818dc80368e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 31 Oct 2021 05:42:16 +0100 Subject: [PATCH 208/438] 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 56d7f505132c998c84a8dc7d9151baa446e846fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Nov 2021 05:43:15 +0100 Subject: [PATCH 209/438] 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 82462c64ff354152a8f83ea0e0eba826cd724c55 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 15 Nov 2021 10:24:27 -0500 Subject: [PATCH 210/438] compile lxml to avoid broken official wheel --- Dockerfile | 1 + README.md | 1 + readme-vars.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 73278c5..2e90383 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,6 +48,7 @@ RUN \ echo "UpdateMethod=docker\nBranch=master\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 6efcb97..fd41109 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. * **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 ec07456..80d6521 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official wheel." } - { 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 bc790db960d98a89d490ceba131e49baae269d31 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Nov 2021 03:51:45 +0100 Subject: [PATCH 211/438] 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 a4eb68e7944f14067b45dfdfaf06a482f366c074 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Nov 2021 05:47:22 +0100 Subject: [PATCH 212/438] 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 9df3ee107f2be7a2d14d205d2f2b4ae5bfa048d1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 05:43:46 +0100 Subject: [PATCH 213/438] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9fb5abb..79dca22 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}:latest 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}:latest 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}:latest \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:latest || : + 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}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --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}:latest 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-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${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 e102f63f9b633179207408b80c13cbc903433fae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 05:44:58 +0100 Subject: [PATCH 214/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fd41109..6f4c40d 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 41a53aef27578ce2c8d646b2d3b12d822a670b39 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 Jan 2022 05:47:22 +0100 Subject: [PATCH 215/438] 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 b57b87f02a51448e8c8cb94b2203a4c753632e55 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jan 2022 05:45:16 +0100 Subject: [PATCH 216/438] 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 c32864203b14b2f6a09063f600d71c3f7a900308 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Feb 2022 05:44:57 +0100 Subject: [PATCH 217/438] 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 989e192e8026fa91f18bfeb03a545715ed910d3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Feb 2022 05:45:36 +0100 Subject: [PATCH 218/438] 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 2daa8f4cacdf9a456738be9fbfad0f21a84417d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Feb 2022 18:14:40 +0100 Subject: [PATCH 219/438] 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 482df2b51b7ba1031e300c25cc8e5d62ff6e4350 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Feb 2022 05:43:37 +0100 Subject: [PATCH 220/438] 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 b9c0956ec2f088b4fdeaa526090330b6046e52c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Mar 2022 22:47:42 -0600 Subject: [PATCH 221/438] 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 3404b76..05d0901 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 @@ -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 edd2e748c0d6db0ad5d5d66510877afbed88b52f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Mar 2022 05:47:40 +0100 Subject: [PATCH 222/438] 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 dd96c1b7f1694db90e712a760f12090b6a8f0dcc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Mar 2022 06:47:18 +0200 Subject: [PATCH 223/438] 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 6ed00240e96e95185ffe0183ad00f53f30beee12 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Apr 2022 06:46:48 +0200 Subject: [PATCH 224/438] 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 a4316c46dbc1209bbf7ad6992f2985b29538500f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Apr 2022 23:45:54 -0500 Subject: [PATCH 225/438] 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 0cc337b..fbb4014 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 @@ -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 6dc828c281a83654697afc959e3e3654e1e3dc94 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Apr 2022 06:47:52 +0200 Subject: [PATCH 226/438] 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 4baef620acb870a8b41eb4bb93ca1590126578f3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 08:11:23 -0500 Subject: [PATCH 227/438] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 79dca22..3a594a3 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 ca31ae9221b518e87e81de9375675d70d26a34ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 08:12:46 -0500 Subject: [PATCH 228/438] Bot Updating Templated Files --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6f4c40d..1d155c4 100644 --- a/README.md +++ b/README.md @@ -46,26 +46,26 @@ 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:latest` 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-\ | ## Version Tags -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. +This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. -| Tag | Description | -| :----: | --- | -| latest | Stable releases from Bazarr | -| development | Pre-releases from Bazarr | +| Tag | Available | Description | +| :----: | :----: |--- | +| latest | ✅ | Stable releases from Bazarr | +| development | ✅ | Pre-releases from Bazarr | ## Application Setup @@ -83,7 +83,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:latest container_name: bazarr environment: - PUID=1000 @@ -111,7 +111,7 @@ docker run -d \ -v /path/to/movies:/movies `#optional` \ -v /path/to/tv:/tv `#optional` \ --restart unless-stopped \ - lscr.io/linuxserver/bazarr + lscr.io/linuxserver/bazarr:latest ``` ## Parameters @@ -171,7 +171,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * 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` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bazarr:latest` ## Updating Info @@ -189,7 +189,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/bazarr` +* Update the image: `docker pull lscr.io/linuxserver/bazarr:latest` * 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) From 0312956554f048a9d185717fa7e0e6d5cc442413 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Apr 2022 08:20:20 -0500 Subject: [PATCH 229/438] 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 56724e55207b677c53abeef5a573cde918312494 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 7 May 2022 23:44:57 -0500 Subject: [PATCH 230/438] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a594a3..78dafd3 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 bc43aaadc339b6dd8dd5c75e3699a826741c9ae3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 7 May 2022 23:52:07 -0500 Subject: [PATCH 231/438] 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 b085a3eb7a3d75fe37f651c7181aefd479136b2b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 May 2022 06:57:30 +0200 Subject: [PATCH 232/438] 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 e53cf6b1332aff6f50234052c3411cb922b8d0ff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 22 May 2022 06:50:31 +0200 Subject: [PATCH 233/438] 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 6c07a48..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 @@ -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 2243df3d94be321ae8ae34ae6e3b2e816ba1046c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 2 Jul 2022 08:15:15 -0500 Subject: [PATCH 234/438] 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 cc4b5886e596aa280f552d282af7b9025da05833 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Jul 2022 23:51:25 -0500 Subject: [PATCH 235/438] 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..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.1o-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.1o-r0 +libssl1.1-1.1.1q-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From c8c7428095551c40f17b0be5c23cf23f033a6820 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 23 Jul 2022 23:57:36 -0500 Subject: [PATCH 236/438] 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 0a2ea67..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 @@ -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 @@ -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 6cf152bc0cfd10fd76e4206b89ab56f365eb579f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Jul 2022 23:57:07 -0500 Subject: [PATCH 237/438] 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 a0e6a2b6e3f83fb6a9773a2327a8f8b0aa813e98 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 6 Aug 2022 23:49:48 -0500 Subject: [PATCH 238/438] 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 f9a4137..56d1456 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 @@ -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 7eceaa80796b96b678ed766e5c9a21c57fe5af51 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Aug 2022 06:52:57 +0200 Subject: [PATCH 239/438] 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 f020e03611b5802eddaaa332d94ead13af296b40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 20 Aug 2022 23:57:04 -0500 Subject: [PATCH 240/438] 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 b5f6032716e2188dab2c7ed6cad11919ef088ead Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Aug 2022 00:14:36 -0500 Subject: [PATCH 241/438] 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 9617c30ac19e8d939e565df97830c7ac244c638a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Sep 2022 00:18:20 -0500 Subject: [PATCH 242/438] 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 3c7959f83b12f10e9508ae09b4381199bed1f3b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Sep 2022 07:19:57 +0200 Subject: [PATCH 243/438] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 78dafd3..2ff7d08 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 68ff72ec489ceb177405e53333aae025459d634d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Sep 2022 07:22:01 +0200 Subject: [PATCH 244/438] 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 e6b1700282b70e236f0d2df3fb4b341eb36331e2 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 11 Oct 2022 14:35:44 +0100 Subject: [PATCH 245/438] Migrate to s6v3 --- Dockerfile | 12 ++++++------ Dockerfile.aarch64 | 11 ++++++----- Dockerfile.armhf | 11 ++++++----- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + .../init-bazarr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-bazarr-config/run} | 0 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up | 1 + .../dependencies.d/init-bazarr-config | 0 .../s6-rc.d/svc-bazarr/dependencies.d/init-services | 0 .../s6-overlay/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 + .../s6-rc.d/user/contents.d/init-bazarr-config | 0 .../s6-overlay/s6-rc.d/user/contents.d/svc-bazarr | 0 root/etc/services.d/bazarr/run | 10 ---------- 19 files changed, 31 insertions(+), 28 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 2e90383..b4770be 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,16 +21,15 @@ 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 bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ @@ -45,11 +45,10 @@ 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=master\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 +63,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8756a6f..97887d5 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,16 +21,15 @@ 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 bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ @@ -45,10 +45,10 @@ 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=master\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 +63,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7b8c268..2b605de 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,16 +21,15 @@ 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 bazarr ****" && \ if [ -z ${BAZARR_VERSION+x} ]; then \ @@ -45,10 +45,10 @@ 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=master\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 +63,5 @@ COPY root/ / # ports and volumes EXPOSE 6767 + VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 2ff7d08..5abc652 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 1d155c4..77747ce 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. * **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. * **22.10.21:** - Added openblas package to prevent numpy error. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index cc58870..8823ec4 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -26,6 +26,6 @@ repo_vars: - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - - CI_WEBPATH='' + - 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 80d6521..b7c5545 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.10.22:", desc: "Rebase master branch to Alpine 3.16, migrate to s6v3." } - { date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official wheel." } - { 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." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run 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 new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file 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 new file mode 100644 index 0000000..2d0b6ae --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-bazarr-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run new file mode 100755 index 0000000..56ca65d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv 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 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run deleted file mode 100644 index 05019cf..0000000 --- a/root/etc/services.d/bazarr/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/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} -fi - -exec \ - s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \ - --no-update --config /config From fb42b51f41e8b359c2f7afffd43fda811c6f4320 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 11 Oct 2022 14:36:25 +0100 Subject: [PATCH 246/438] Build unrar --- Dockerfile | 11 +++++++++++ Dockerfile.aarch64 | 11 +++++++++++ Dockerfile.armhf | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/Dockerfile b/Dockerfile index b4770be..cd2393a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,17 @@ RUN \ py3-pip \ python3 \ 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/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 97887d5..ccbd696 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -31,6 +31,17 @@ RUN \ py3-pip \ python3 \ 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/latest" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2b605de..ab4eedf 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -31,6 +31,17 @@ RUN \ py3-pip \ python3 \ 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/latest" \ From b66e8e8a216a183cdfc9d9ed554ab32f5176de44 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 12 Oct 2022 14:53:50 -0500 Subject: [PATCH 247/438] 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 b427173..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.2-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 6d11ffc5ec421060d97f5e012cbdd765f7a351e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 16 Oct 2022 00:23:20 -0500 Subject: [PATCH 248/438] 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 f8d2b7f12483e0b712233e3ba5bf237ff850393f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Oct 2022 00:01:38 -0500 Subject: [PATCH 249/438] 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 0d93d4779eacfcb7081c35be54194035234f092c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Nov 2022 23:46:36 -0500 Subject: [PATCH 250/438] 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 c9ae355..5002696 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 @@ -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 cea5b9956b632464b69a999df0b8f5b83a691870 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Nov 2022 05:48:32 +0100 Subject: [PATCH 251/438] 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 10493eb..f37c269 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 682329695645e76753f37aaad409d5b9dfe836ac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Nov 2022 05:54:07 +0100 Subject: [PATCH 252/438] 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 5002696..36ca170 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 @@ -78,8 +78,8 @@ 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-utils-1.2.3-r0 +musl-1.2.3-r2 +musl-utils-1.2.3-r1 ncurses-libs-6.3_p20220521-r0 ncurses-terminfo-base-6.3_p20220521-r0 nettle-3.7.3-r0 @@ -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 @@ -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 5aa10d632c51394d9915b1a46bef1c720bd5a1bd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 19 Nov 2022 22:42:14 -0600 Subject: [PATCH 253/438] 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 3009ece541e3bd341463a7312677c147a610b573 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Dec 2022 22:34:02 -0600 Subject: [PATCH 254/438] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5abc652..f11b820 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 173b732154e65f33ec63b759cbb42582c7630c9b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Dec 2022 22:35:27 -0600 Subject: [PATCH 255/438] 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 9e7fd5ca9cea78ba744a383c2e87bcd5ffa6d6e6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Dec 2022 22:36:53 -0600 Subject: [PATCH 256/438] 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 f37c269..6d49d15 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: 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/master' 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 d044e7d..73bca61 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!' + 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.yml) or [feature](https://github.com/linuxserver/docker-bazarr/blob/master/.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/master/.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 87705db..90d783c 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: 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/master' 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 5559cff0c07595f42b821134e64df7010273c73e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 11 Dec 2022 05:36:08 +0100 Subject: [PATCH 257/438] 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 725835e78b67d7b29d8bc6354ddeaa845ed7bd92 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 17 Dec 2022 22:33:23 -0600 Subject: [PATCH 258/438] 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 35f4a6c..973803d 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 @@ -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 9b1384c89d1499f86dfb4219b3c55477d139275f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 31 Dec 2022 10:57:19 -0600 Subject: [PATCH 259/438] 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 10c44d765824faa909d9829b536459a5dea98214 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 23 Jan 2023 17:17:22 +0000 Subject: [PATCH 260/438] 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 +- .../s6-rc.d/init-bazarr-config/type | 2 +- .../s6-overlay/s6-rc.d/init-bazarr-config/up | 2 +- .../s6-rc.d/svc-bazarr/notification-fd | 2 +- root/etc/s6-overlay/s6-rc.d/svc-bazarr/type | 2 +- 11 files changed, 52 insertions(+), 41 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 cd2393a..cf6b81a 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=master\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 ccbd696..1c51da2 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=master\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 ab4eedf..995b731 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=master\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 77747ce..e9b5c70 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.01.23:** - Rebase master branch to Alpine 3.17. * **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. * **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel. diff --git a/readme-vars.yml b/readme-vars.yml index b7c5545..95b8509 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.23:", desc: "Rebase master branch to Alpine 3.17." } - { date: "11.10.22:", desc: "Rebase master branch to Alpine 3.16, migrate to s6v3." } - { date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official wheel." } - { 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 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 77b0f18ac3ac325de9a83eb549fcfdfffc62cc9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Jan 2023 18:50:26 +0100 Subject: [PATCH 261/438] 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 4c91471cc47c3a8dd2f63b49805c1186ce94c661 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 28 Jan 2023 22:33:19 -0600 Subject: [PATCH 262/438] 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 2f4843612776b6c7fbd881c80eadbe511e131ca0 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 2 Feb 2023 15:27:51 -0500 Subject: [PATCH 263/438] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e9b5c70..c9fe68f 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **02.02.23:** - Install openssl1.1-compat. * **23.01.23:** - Rebase master branch to Alpine 3.17. * **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. * **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. From ad231a9e4b1b55c05f03e951e66b903c6c8f332c Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 2 Feb 2023 15:28:32 -0500 Subject: [PATCH 264/438] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c9fe68f..e9b5c70 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **02.02.23:** - Install openssl1.1-compat. * **23.01.23:** - Rebase master branch to Alpine 3.17. * **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. * **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. From fc28f1da5f15cb89dda052122242acacf76a8e1d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 5 Feb 2023 05:33:51 +0100 Subject: [PATCH 265/438] 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 0341ee34a35adeae2e8bea66eb01013513e3b8d1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 12 Feb 2023 05:33:00 +0100 Subject: [PATCH 266/438] Bot Updating Templated Files --- Jenkinsfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f11b820..1e8ae22 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( @@ -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-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest 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-latest 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-latest 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-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-latest 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 4985c8d869d0da81baae18c38986b36b37d42f54 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 12 Feb 2023 05:34:14 +0100 Subject: [PATCH 267/438] Bot Updating Templated Files --- .editorconfig | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/permissions.yml | 9 +++++++++ README.md | 10 +++++----- 4 files changed, 16 insertions(+), 7 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 73bca61..8868765 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.yml) or [feature](https://github.com/linuxserver/docker-bazarr/blob/master/.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/master/.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 e9b5c70..8e7756f 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\> | ## Version Tags @@ -66,7 +66,6 @@ This image provides various versions that are available via tags. Please read th | :----: | :----: |--- | | latest | ✅ | Stable releases from Bazarr | | development | ✅ | Pre-releases from Bazarr | - ## Application Setup - Once running the URL will be `http://<host-ip>:6767`. @@ -88,7 +87,7 @@ services: environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Etc/UTC volumes: - /path/to/bazarr/config:/config - /path/to/movies:/movies #optional @@ -105,13 +104,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 `#optional` \ -v /path/to/tv:/tv `#optional` \ --restart unless-stopped \ lscr.io/linuxserver/bazarr:latest + ``` ## Parameters @@ -123,7 +123,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 5dffb1f41e8ba84770e5e473a15d2340d6f97ecf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 12 Feb 2023 05:37:18 +0100 Subject: [PATCH 268/438] 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 75a5744..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 @@ -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 @@ -98,10 +98,10 @@ 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.2-r0 +sdl2-2.26.3-r0 shadow-4.13-r0 skalibs-2.12.0.1-r0 soxr-0.1.3-r3 From cae9305edf663ec59a6e791b50a1f5c6ab7d12ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 19 Feb 2023 05:35:19 +0100 Subject: [PATCH 269/438] 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 7c66fa1ee8a47108adcac1062f3cc297828e87ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 25 Feb 2023 22:36:36 -0600 Subject: [PATCH 270/438] 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 968df34..4d93c28 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 @@ -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 @@ -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 411dbb622404c22e3c349f562a7aec6293055053 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Sun, 26 Feb 2023 16:10:48 +0000 Subject: [PATCH 271/438] Add dependencies for postgres support. Add mediainfo. --- Dockerfile | 14 ++++++++++---- Dockerfile.aarch64 | 14 ++++++++++---- Dockerfile.armhf | 14 ++++++++++---- README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run | 1 + root/etc/s6-overlay/s6-rc.d/svc-bazarr/run | 3 ++- 7 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf6b81a..baf1d3f 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,6 +41,8 @@ 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/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -46,20 +50,22 @@ RUN \ 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" > /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 && \ + 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 1c51da2..bacc90d 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,6 +41,8 @@ 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/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -46,20 +50,22 @@ RUN \ 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" > /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 && \ + 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 995b731..41fb6f1 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,6 +41,8 @@ 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/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -46,20 +50,22 @@ RUN \ 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" > /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 && \ + 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/README.md b/README.md index 8e7756f..3d63b57 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase master branch to Alpine 3.17. * **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. * **15.15.21:** - Temp fix for lxml, compile from scratch to avoid broken official wheel. diff --git a/readme-vars.yml b/readme-vars.yml index 95b8509..f997ba9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | # changelog changelogs: + - { date: "26.02.23:", desc: "Add dependencies for postgres support. Add mediainfo." } - { date: "23.01.23:", desc: "Rebase master branch to Alpine 3.17." } - { date: "11.10.22:", desc: "Rebase master branch to Alpine 3.16, migrate to s6v3." } - { date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official 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 3a13f42..ae4017a 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,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # permissions lsiown -R abc:abc \ 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..8581337 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,6 @@ #!/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 + cd /app/bazarr/bin s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py --no-update --config /config From 503d3cd4716183664341306f4737a4b2ad7de9e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 3 Mar 2023 03:20:05 +0100 Subject: [PATCH 272/438] Bot Updating Templated Files --- Jenkinsfile | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e8ae22..cc9538b 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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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 7d37ad2c2816c5f6872ce138fcd41b33d06a0b49 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 3 Mar 2023 03:23:39 +0100 Subject: [PATCH 273/438] Bot Updating Package Versions --- package_versions.txt | 256 ++++++++++++++++++++++--------------------- 1 file changed, 133 insertions(+), 123 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4d93c28..80a89f4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,123 +1,133 @@ -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-r0 -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 -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 -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-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 -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 +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 +libzmq 4.3.4-r1 apk +linux-pam 1.5.2-r1 apk +lxml 4.9.2 python +mbedtls 2.28.2-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 +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 +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 d3519ac36e86731cbf6a273a7b50835ac11f03ca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 3 Mar 2023 10:33:34 +0100 Subject: [PATCH 274/438] Bot Updating Package Versions --- package_versions.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 80a89f4..6a28f9d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -54,6 +54,7 @@ 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 @@ -83,10 +84,12 @@ 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 @@ -104,6 +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 python 3.10.10 binary python3 3.10.10-r0 apk readline 8.2.0-r0 apk @@ -118,6 +122,7 @@ 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 From d2d38c304c8efb86e2b5684e3c737b5c6cac2dbc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 Mar 2023 22:34:08 -0600 Subject: [PATCH 275/438] 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 4bb5af364919dc85bdb9976a8e5ed6ac5ef28f55 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 18 Mar 2023 23:33:39 -0500 Subject: [PATCH 276/438] 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 4718581..546af7b 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 @@ -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 dff889ca935e7ae23e910d3d5c502a77e06c05a0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 25 Mar 2023 23:42:59 -0500 Subject: [PATCH 277/438] 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 546af7b..ce9f142 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,10 +15,10 @@ 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 +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,8 +40,8 @@ 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 +libcrypto3 3.0.8-r1 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 @@ -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 799285384e49794f8826c8558b733e7ee6c18d99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Apr 2023 06:30:00 +0200 Subject: [PATCH 278/438] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc9538b..b28151d 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 77a4b097325137f9ec028cf3d6f5232d44e0669b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Apr 2023 06:31:40 +0200 Subject: [PATCH 279/438] 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 adb16a9366e0e1cdd6ab9748175afda9c90a2184 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Apr 2023 06:33:19 +0200 Subject: [PATCH 280/438] 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 71ee61a033b12da95e3f4d1915855a6ae47734b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Apr 2023 06:37:15 +0200 Subject: [PATCH 281/438] 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 ce9f142..d7e4bd4 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 @@ -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,9 +121,9 @@ 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 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 049a73d41ee0beef20b42d877d3b5c665064dd34 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Apr 2023 16:21:35 -0500 Subject: [PATCH 282/438] 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 47f219bac336177ef47bb6ea090477bb22ed06fe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Apr 2023 23:21:29 +0200 Subject: [PATCH 283/438] 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 c0d415c..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 @@ -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 d6761d3c817905576ec830e1e64331412039745e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Apr 2023 23:23:18 +0200 Subject: [PATCH 284/438] 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 bf77a8ea5cf0db63b29f79e90c688e83bc73812f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Apr 2023 23:19:53 +0200 Subject: [PATCH 285/438] Bot Updating Templated Files --- Jenkinsfile | 91 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b28151d..4a3f5f0 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}':latest 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}:latest 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 master build check the S6 service file perms + stage("Check S6 Service file Permissions"){ + when { + branch "master" + 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 fb95fa3bdb47ff486f83f9cc53202d62af62dfb6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Apr 2023 23:21:37 +0200 Subject: [PATCH 286/438] 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 6d49d15..254d231 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_MASTER }}" ]; then echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\". ****" + echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\`" >> $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/latest" | jq -r '. | .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="latest" @@ -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/master/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/master/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 90d783c..ba17ba3 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_MASTER }}" ]; then echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\` 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/master/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 master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\". ****" + echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/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 5454c430c18e5fa86734062f707376f5635f5c3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 May 2023 02:06:31 +0000 Subject: [PATCH 287/438] Bot Updating Package Versions --- package_versions.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ec78358..164501c 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 @@ -40,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-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 +67,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 @@ -99,13 +100,13 @@ 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 p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk -pip 23.1 python +pip 23.1.2 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.11 binary @@ -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.6.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 f55cf1c5884e4dc1cde0745752261803ea137524 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 May 2023 21:22:26 +0000 Subject: [PATCH 288/438] 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 164501c..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 @@ -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 06900832eb36ce50104066f60b213e9bc899f148 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 21:19:56 +0000 Subject: [PATCH 289/438] Bot Updating Templated Files --- Jenkinsfile | 121 ++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4a3f5f0..07ee874 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-' + 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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 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 = 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 = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-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/' @@ -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}:latest || : - 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-latest \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest \ - ${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 90fb2a339621ba44ac97b3f282831eb33d7d66f8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 21:25:10 +0000 Subject: [PATCH 290/438] 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 cecd919d6a2503816a108451f19f89baa74e9b7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 May 2023 21:19:33 +0000 Subject: [PATCH 291/438] 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 eba5dc6..91fee0b 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 @@ -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 @@ -41,8 +41,8 @@ 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 -libcurl 8.1.0-r1 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 libexpat 2.5.0-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 @@ -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 @@ -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 2f81dd59d84d2a70b779bf9b1ece9ca9ed897c36 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Jun 2023 21:25:05 +0000 Subject: [PATCH 292/438] 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 4356d67079d594c70e4d9a62eba181fa7b57e4ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Jun 2023 21:22:35 +0000 Subject: [PATCH 293/438] 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 a4dce29..9c245c6 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 @@ -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 11f6c518957810aa6b11c55fa9b1490b8379263f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Jun 2023 21:21:45 +0000 Subject: [PATCH 294/438] 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 9c245c6..135db0b 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 @@ -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 @@ -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 @@ -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 cdf8566de7409554b6c92099e1a1182f3570ea16 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 21:21:57 +0000 Subject: [PATCH 295/438] Bot Updating Templated Files --- Jenkinsfile | 83 +++++++++++++---------------------------------------- 1 file changed, 20 insertions(+), 63 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 07ee874..715c639 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-' + 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-' + 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 } @@ -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-' + 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-' + 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 } @@ -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-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = 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://www.bazarr.media/) 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-latest 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-latest - 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-latest 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-latest - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-latest 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}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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-latest") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} From c33f6c1f7acc7a748ee299061ad9c91360a767bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 21:23:25 +0000 Subject: [PATCH 296/438] 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 41fb6f1..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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - 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=master\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 c8e9a708c0747181ff13bada294051ba0c9d1494 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 21:26:17 +0000 Subject: [PATCH 297/438] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - README.md | 3 +- readme-vars.yml | 72 +++++++++++++--------------- 3 files changed, 35 insertions(+), 41 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 3d63b57..90dfd58 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 | ❌ | | ## Version Tags @@ -237,6 +237,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) * **26.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase master branch to Alpine 3.17. * **11.10.22:** - Rebase master branch to Alpine 3.16, migrate to s6v3. diff --git a/readme-vars.yml b/readme-vars.yml index f997ba9..26d1358 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,65 +6,59 @@ project_url: "https://www.bazarr.media/" 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"} - - # development version + - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} development_versions: true development_versions_items: - - { tag: "latest", desc: "Stable releases from Bazarr" } - - { tag: "development", desc: "Pre-releases from Bazarr" } - + - {tag: "latest", desc: "Stable releases from Bazarr"} + - {tag: "development", desc: "Pre-releases from 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: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data"} 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 opt_param_usage_include_vols: true opt_param_volumes: - - { 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: "/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"} # 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: "26.02.23:", desc: "Add dependencies for postgres support. Add mediainfo." } - - { date: "23.01.23:", desc: "Rebase master branch to Alpine 3.17." } - - { date: "11.10.22:", desc: "Rebase master branch to Alpine 3.16, migrate to s6v3." } - - { date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official wheel." } - - { 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, add `package_info`." } - - { 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: "01.06.20:", desc: "Rebasing to alpine 3.12." } - - { date: "13.05.20:", desc: "Add donation links for Bazarr to Github sponsors button and container log." } - - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." } - - { date: "28.12.19:", desc: "Upgrade to Python 3." } - - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - - { date: "13.06.19:", desc: "Add env variable for setting umask." } - - { date: "12.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe." } - - { date: "17.04.19:", desc: "Add default UTC timezone if user does not set it." } - - { 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: "26.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} + - {date: "23.01.23:", desc: "Rebase master branch to Alpine 3.17."} + - {date: "11.10.22:", desc: "Rebase master branch to Alpine 3.16, migrate to s6v3."} + - {date: "15.15.21:", desc: "Temp fix for lxml, compile from scratch to avoid broken official wheel."} + - {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, add `package_info`."} + - {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: "01.06.20:", desc: "Rebasing to alpine 3.12."} + - {date: "13.05.20:", desc: "Add donation links for Bazarr to Github sponsors button and container log."} + - {date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles."} + - {date: "28.12.19:", desc: "Upgrade to Python 3."} + - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."} + - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."} + - {date: "13.06.19:", desc: "Add env variable for setting umask."} + - {date: "12.06.19:", desc: "Swap to install deps using maintainers requirements.txt, add ffmpeg for ffprobe."} + - {date: "17.04.19:", desc: "Add default UTC timezone if user does not set it."} + - {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 1cfe2582811f25f1e0f857a5a856cf708e65dbf6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Jul 2023 21:31:12 +0000 Subject: [PATCH 298/438] 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 c88676a4df5c7e3396ee8fbf4963fc0f8d12dca7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Jul 2023 02:01:57 +0000 Subject: [PATCH 299/438] 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 85b5771..6f75e73 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 @@ -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 a73c36e170ab7e4716c62b706bf57b730a677b44 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Jul 2023 21:18:26 +0000 Subject: [PATCH 300/438] 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 6f75e73..4d07e47 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.9-r1 apk +libcrypto3 3.0.9-r2 apk libcurl 8.1.2-r0 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.9-r1 apk +libssl3 3.0.9-r2 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -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.2 python +pip 23.2 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.12 binary From e56ac99aa4edb333718c9118286c53cce4d5275c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 22 Jul 2023 14:28:36 +0000 Subject: [PATCH 301/438] 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 4d07e47..2c59d80 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.2-r0 apk +curl 8.2.0-r1 apk dbus-libs 1.14.8-r0 apk ffmpeg 5.1.3-r0 apk ffmpeg-libs 5.1.3-r0 apk @@ -41,8 +41,8 @@ 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-r2 apk -libcurl 8.1.2-r0 apk +libcrypto3 3.0.9-r3 apk +libcurl 8.2.0-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk libexpat 2.5.0-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.9-r2 apk +libssl3 3.0.9-r3 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -98,7 +98,7 @@ ncurses-libs 6.3_p20221119-r1 apk ncurses-terminfo-base 6.3_p20221119-r1 apk netcat-openbsd 1.130-r4 apk nettle 3.8.1-r0 apk -nghttp2-libs 1.51.0-r0 apk +nghttp2-libs 1.51.0-r1 apk numactl 2.0.16-r1 apk numpy 1.25.1 python oniguruma 6.9.8-r0 apk @@ -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.2 python +pip 23.2.1 python procps 3.3.17-r2 apk psycopg2-binary 2.9.6 python python 3.10.12 binary @@ -130,7 +130,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.40.0 python +wheel 0.41.0 python x264-libs 0.164_git20220602-r0 apk x265-libs 3.5-r3 apk xvidcore 1.3.7-r1 apk From caec5ca6e847142afc4e9ddc436129adc2d2835a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Aug 2023 21:19:22 +0000 Subject: [PATCH 302/438] Bot Updating Package Versions --- package_versions.txt | 279 ++++++++++++++++++++++--------------------- 1 file changed, 140 insertions(+), 139 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2c59d80..8edcc27 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,139 +1,140 @@ -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.2.0-r1 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-r3 apk -libcurl 8.2.0-r1 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-r3 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-r1 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.2.1 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.41.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 +Simple Launcher Executable 1.1.0.14 dotnet +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.2.1-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-r3 apk +libcurl 8.2.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.5-r0 apk +libssl3 3.0.9-r3 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-r1 apk +numactl 2.0.16-r1 apk +numpy 1.25.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.2.1 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.41.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 From 285f9c5d917bc1e49f7f9ab3d851313888e482fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 8 Aug 2023 21:21:18 +0000 Subject: [PATCH 303/438] 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 8edcc27..3815726 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,7 +42,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.9-r3 apk +libcrypto3 3.0.10-r0 apk libcurl 8.2.1-r0 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -60,7 +60,7 @@ 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 +libpng 1.6.39-r0 apk libproc 3.3.17-r2 apk libpulse 16.1-r6 apk librist 0.2.7-r0 apk @@ -68,7 +68,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.9-r3 apk +libssl3 3.0.10-r0 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -90,7 +90,7 @@ 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 +mbedtls 2.28.4-r0 apk mediainfo 22.09-r0 apk mpdecimal 2.5.1-r1 apk musl 1.2.3-r5 apk @@ -109,7 +109,7 @@ p11-kit 0.24.1-r1 apk pcre2 10.42-r0 apk pip 23.2.1 python procps 3.3.17-r2 apk -psycopg2-binary 2.9.6 python +psycopg2-binary 2.9.7 python python 3.10.12 binary python3 3.10.12-r0 apk readline 8.2.0-r0 apk @@ -131,7 +131,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.41.0 python +wheel 0.41.1 python x264-libs 0.164_git20220602-r0 apk x265-libs 3.5-r3 apk xvidcore 1.3.7-r1 apk From 4bcdd646d6997a601cb11df6d60b4e81f237e882 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Thu, 10 Aug 2023 17:40:53 +0100 Subject: [PATCH 304/438] 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 baf1d3f..e075de9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.17 # set version label -ARG UNRAR_VERSION=6.1.7 +ARG UNRAR_VERSION=6.2.10 ARG BUILD_DATE ARG VERSION ARG BAZARR_VERSION diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bacc90d..984d4cb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 # set version label -ARG UNRAR_VERSION=6.1.7 +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 26d1358..02839c4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -38,6 +38,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: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "26.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} - {date: "23.01.23:", desc: "Rebase master branch to Alpine 3.17."} From 328d2d5ac254227fdfa4cb06cfcf95a31a3174ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 10 Aug 2023 17:44:11 +0000 Subject: [PATCH 305/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 90dfd58..5bacadb 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.08.23:** - Bump unrar to 6.2.10. * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **26.02.23:** - Add dependencies for postgres support. Add mediainfo. * **23.01.23:** - Rebase master branch to Alpine 3.17. From 528e2a183e00bf9a4bd62ca3635e4eabd4074d17 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 11 Aug 2023 13:46:21 +0100 Subject: [PATCH 306/438] Rebase to 3.18 --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 8 ++++---- readme-vars.yml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e075de9..fbb87e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # 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.2.10 @@ -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/ \ + 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 984d4cb..7758f77 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # 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.2.10 @@ -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/ \ + 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/readme-vars.yml b/readme-vars.yml index 02839c4..cdd0e21 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -38,6 +38,7 @@ app_setup_block: | - You must complete all the setup parameters in the webui before you can save the config. # changelog changelogs: + - {date: "11.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "26.02.23:", desc: "Add dependencies for postgres support. Add mediainfo."} From 5c53589c824e36a50b800712baf8aa478f2dec28 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 11 Aug 2023 13:04:21 +0000 Subject: [PATCH 307/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5bacadb..97ab2e8 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.08.23:** - Rebase to Alpine 3.18. * **10.08.23:** - Bump unrar to 6.2.10. * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **26.02.23:** - Add dependencies for postgres support. Add mediainfo. From 8374c1e7344c5830f44286b17b60cb940439b602 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 11 Aug 2023 13:08:53 +0000 Subject: [PATCH 308/438] Bot Updating Package Versions --- package_versions.txt | 305 +++++++++++++++++++++++-------------------- 1 file changed, 165 insertions(+), 140 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3815726..c32c5d2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,140 +1,165 @@ -NAME VERSION TYPE -Pillow 10.0.0 python -Simple Launcher Executable 1.1.0.14 dotnet -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.2.1-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.10-r0 apk -libcurl 8.2.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.39-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.10-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-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.4-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-r1 apk -numactl 2.0.16-r1 apk -numpy 1.25.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.2.1 python -procps 3.3.17-r2 apk -psycopg2-binary 2.9.7 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.41.1 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 +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.2-r0 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.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.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.2-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-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.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 +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.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.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.1 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 06a37c191bc976361f71026d35ca8a21b02e4caf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Aug 2023 21:21:43 +0000 Subject: [PATCH 309/438] 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 c32c5d2..345d367 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,13 +4,12 @@ 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 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 @@ -137,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 1bf9e399d5e337f3366012262899025844a30a9b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 22 Aug 2023 21:21:56 +0000 Subject: [PATCH 310/438] 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 345d367..8460bca 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 @@ -155,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 81b14df436d7489a96ddc55eca74bb043b1a8180 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Aug 2023 21:19:40 +0000 Subject: [PATCH 311/438] 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 f1787081aa1f84b1a6863b124d5d77ac356ba814 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 5 Sep 2023 21:22:52 +0000 Subject: [PATCH 312/438] 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 428b8dd199b791d4c5ecd7c68aeec280fcc87b1a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Sep 2023 21:19:36 +0000 Subject: [PATCH 313/438] 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..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.1.2 python +setuptools 68.2.2 python shaderc 2023.3-r1 apk shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk From 4efb05dd5283f9f09fc5501c832e5728a1192814 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 16 Sep 2023 03:27:05 +0000 Subject: [PATCH 314/438] 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 757a255..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 @@ -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 ef9b6eaa9d31e27abc9b674bd8881ee1591dcd31 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Sep 2023 21:20:07 +0000 Subject: [PATCH 315/438] 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 e22566820b37cf4aecc327b519b468dadd2f04e6 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Wed, 20 Sep 2023 20:29:27 +0100 Subject: [PATCH 316/438] Install unrar from linuxserver repo --- Dockerfile | 17 +++++------------ Dockerfile.aarch64 | 17 +++++------------ readme-vars.yml | 1 + 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbb87e8..95ad6c1 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 @@ -29,17 +30,6 @@ RUN \ 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 && \ @@ -77,6 +67,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 7758f77..cb08cbd 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 @@ -29,17 +30,6 @@ RUN \ 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 && \ @@ -77,6 +67,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 cdd0e21..cd2bb01 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -38,6 +38,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: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "11.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} From cd3db544b73bbf5ee2ccca30f3675f744e1ef21b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 21 Sep 2023 08:09:02 +0000 Subject: [PATCH 317/438] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 97ab2e8..e4c0f1b 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,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). * **11.08.23:** - Rebase to Alpine 3.18. * **10.08.23:** - Bump unrar to 6.2.10. * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) From e5ac9062787ad30ea887c729718b74f5dfaca57f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 21 Sep 2023 08:12:18 +0000 Subject: [PATCH 318/438] 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 0093e89270f307e60b7fd0c72b89af73d5799271 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Sep 2023 21:20:09 +0000 Subject: [PATCH 319/438] 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 8796e3d0387024a6dcbcc5c16f181066c5da9fd9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Oct 2023 21:21:13 +0000 Subject: [PATCH 320/438] 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 fdce2a2..9006503 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 @@ -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.9 python pyc 0.1-r0 apk python3 3.11.5-r0 apk python3-pyc 3.11.5-r0 apk From e5053cce0b93a0d5c9490a11d17b16cd878e505c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Oct 2023 21:19:25 +0000 Subject: [PATCH 321/438] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 715c639..c6d0883 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 = 'master' 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 "master" - 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 "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Setting up protection for release branch master" + sh '''#! /bin/bash + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/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 3cee128fa15489af3cce56788eee83b45a91ef51 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Oct 2023 21:21:07 +0000 Subject: [PATCH 322/438] Bot Updating Templated Files --- README.md | 136 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index e4c0f1b..6a9e697 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/master/.github/CONTRIBUTING.md --> - +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read https://github.com/linuxserver/docker-bazarr/blob/master/.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!") @@ -66,6 +65,7 @@ This image provides various versions that are available via tags. Please read th | :----: | :----: |--- | | latest | ✅ | Stable releases from Bazarr | | development | ✅ | Pre-releases from Bazarr | + ## Application Setup - Once running the URL will be `http://<host-ip>:6767`. @@ -73,7 +73,7 @@ This image provides various versions that are available via tags. Please read th ## 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)) @@ -111,12 +111,11 @@ docker run -d \ -v /path/to/tv:/tv `#optional` \ --restart unless-stopped \ lscr.io/linuxserver/bazarr:latest - ``` ## 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 | | :----: | --- | @@ -135,10 +134,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 @@ -147,15 +146,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 @@ -166,12 +170,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:latest` +* 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:latest + ``` ## Updating Info @@ -181,38 +202,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:latest` -* Stop the running container: `docker stop bazarr` -* Delete the container: `docker rm bazarr` +* Update the image: + + ```bash + docker pull lscr.io/linuxserver/bazarr:latest + ``` + +* 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 43389e79d9698bd300e3d01fce73d3a8397be932 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Oct 2023 21:24:09 +0000 Subject: [PATCH 323/438] 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 02c539e694a37878d66efb28eb8f4e21641f69b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Oct 2023 21:22:23 +0000 Subject: [PATCH 324/438] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4f3a220..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 @@ -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,16 +116,16 @@ 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 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 @@ -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 41a6ae2a839dd1265eda8c0e8734baad6734b70b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Oct 2023 21:21:43 +0000 Subject: [PATCH 325/438] 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 259bdc93e39d99453e99078862a579b7dc16a4bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 31 Oct 2023 21:19:35 +0000 Subject: [PATCH 326/438] 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 79151aff885eeb1a47dd7b44dbf4b4b18e41e80b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Nov 2023 21:22:01 +0000 Subject: [PATCH 327/438] 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 addd8e0..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.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.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 f3129c95c84b2a704346c097ceb8ca1f3a11f82e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Nov 2023 21:19:12 +0000 Subject: [PATCH 328/438] 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 487cf04399bf17d27d8d9afa989f45620a95c850 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Nov 2023 21:21:01 +0000 Subject: [PATCH 329/438] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a9e697..f0e02b1 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:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. From b27288cb7d5a9912fcc163092e3e799a8cdfc4ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Nov 2023 21:25:37 +0000 Subject: [PATCH 330/438] 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 e403f1ffda215b2b04f49b5f0d42de4b83bfb7b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Nov 2023 12:46:18 +0000 Subject: [PATCH 331/438] 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 29c5338c4e8b51c96ca2facb7765f55290b088e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 5 Dec 2023 21:19:37 +0000 Subject: [PATCH 332/438] 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 2868a49acf0c7513ede7b516c9e5594c0cc77d4f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Dec 2023 21:23:41 +0000 Subject: [PATCH 333/438] 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 cdecb58..5c6ac09 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 @@ -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 @@ -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 f219eebb30d320bac8f0cadb2d0b07008d90e81c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Dec 2023 21:18:03 +0000 Subject: [PATCH 334/438] 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 5a4117f16f178676080951429c3d7fbaac546184 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sat, 23 Dec 2023 18:08:30 -0600 Subject: [PATCH 335/438] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com> --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- readme-vars.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95ad6c1..b54ad9d 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 cb08cbd..118d24a 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 cd2bb01..bbf9664 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,7 +18,7 @@ development_versions_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: "/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."} @@ -38,6 +38,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: "11.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} From bef7dab5119f679926ff960319232f0db739fb30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Dec 2023 21:19:41 +0000 Subject: [PATCH 336/438] 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 330d70c1f6511c842002d1d8437f31e956d0b380 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Jan 2024 21:20:17 +0000 Subject: [PATCH 337/438] 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 5ee3486..a121820 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 @@ -106,7 +105,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.4 python +lxml 5.0.0 python mbedtls 2.28.5-r0 apk mediainfo 23.07-r0 apk mpdecimal 2.5.1-r2 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 @@ -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 80b7d81273474e2fe316bc00c73c495bc6f60f3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jan 2024 21:20:58 +0000 Subject: [PATCH 338/438] Bot Updating Templated Files --- Jenkinsfile | 295 +++++++++++++++++++++++++++------------------------- 1 file changed, 152 insertions(+), 143 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c6d0883..26802aa 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 = 'master' 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=master -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 master - 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 master - 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 master - 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=master -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 master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master 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 8710dacdc73bf30f5a037c804a18b2b606dd0e04 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jan 2024 21:22:41 +0000 Subject: [PATCH 339/438] Bot Updating Templated Files --- README.md | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/README.md b/README.md index f0e02b1..8bc4d9e 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,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:latest @@ -196,7 +195,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: @@ -261,21 +260,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 473aa750922da13498b241075eb3a3fd8b6b912d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jan 2024 21:26:25 +0000 Subject: [PATCH 340/438] 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 a121820..65a1ce5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -105,7 +105,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 5.0.0 python +lxml 5.1.0 python mbedtls 2.28.5-r0 apk mediainfo 23.07-r0 apk mpdecimal 2.5.1-r2 apk @@ -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 57d2cb2bd314d9f30818c8bc7507f4051b2fcf36 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 16 Jan 2024 21:23:06 +0000 Subject: [PATCH 341/438] 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 65a1ce5..fe2ed11 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-r1 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-r1 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 ed06403f9b49e974f5dca5bf4db5486bd021c044 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jan 2024 21:21:33 +0000 Subject: [PATCH 342/438] 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 fe2ed11..e580644 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 001b0a2457ac668d5d611f174893fa1116545b1e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 Jan 2024 02:27:41 +0000 Subject: [PATCH 343/438] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8bc4d9e..2eca41a 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,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 /config` | Persistent config files | | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | @@ -287,6 +287,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). * **11.08.23:** - Rebase to Alpine 3.18. * **10.08.23:** - Bump unrar to 6.2.10. From 553e7cbdf721df31709f7ce40db77913a15218ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 Jan 2024 02:34:14 +0000 Subject: [PATCH 344/438] 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 e580644..72edccf 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 5.1.0 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 5.1.0 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 8ec93bb7b9b52fd540804f5f8228a874cedff722 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 Jan 2024 21:23:14 +0000 Subject: [PATCH 345/438] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 72edccf..278a388 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 @@ -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 @@ -155,7 +155,7 @@ linux-raw-sys 0.3.7 rust-crate log 0.4.17 rust-crate lxml 5.1.0 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 c8e2f50a1fde52b744ef9dc2575d0e0110a1e3e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 4 Feb 2024 01:35:07 +0000 Subject: [PATCH 346/438] 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 278a388..580d03b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -153,7 +153,7 @@ 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 5.1.0 python +lxml 4.9.4 python maybe-rayon 0.1.1 rust-crate mbedtls 2.28.7-r0 apk mediainfo 23.11-r0 apk @@ -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 13dee5b3d6c9ceec3c0ad8c63057d11ed5f25bc0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Feb 2024 21:20:41 +0000 Subject: [PATCH 347/438] 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 b9d3d2d0454d382f593686611f761f211e1d6d09 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Feb 2024 21:20:42 +0000 Subject: [PATCH 348/438] 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 460ad7c..8fdbb94 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 @@ -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 @@ -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 5ed486e9a7f9d570e05809de456b982591c0bfba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Feb 2024 01:23:44 +0000 Subject: [PATCH 349/438] 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 be56ddf2cda0502fe76744024b743d4aa664bd7f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Feb 2024 21:18:54 +0000 Subject: [PATCH 350/438] Bot Updating Templated Files --- Jenkinsfile | 297 +++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 154 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26802aa..d477943 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=master -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 master - 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 master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - 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=master -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 master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 master + 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 master - 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 master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 master 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 master - 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 master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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 dd7c2f1973260edc5f3df8e1876dec66599317ad Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Feb 2024 21:20:57 +0000 Subject: [PATCH 351/438] 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 254d231..8948cff 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: 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/master' 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 ba17ba3..1a20e70 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: 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/master' 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 1818f1e476e55b7196a9f30428204e8f3157237b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Feb 2024 21:24:46 +0000 Subject: [PATCH 352/438] 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 607d906..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 @@ -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 b3ab894b2709ca5bfe69aa90bf5be14cac6f30a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 5 Mar 2024 00:45:11 +0000 Subject: [PATCH 353/438] 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 3c47c5ca0e72f4b1223ff2378ca1ac76efde319c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Mar 2024 21:20:37 +0000 Subject: [PATCH 354/438] Bot Updating Templated Files --- Jenkinsfile | 61 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d477943..5576cdc 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=master -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 master of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master 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 master --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 master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master 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 master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master 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 master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master 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 7b847e093ec95fdbd1d4fbc84950ab51a4f7086b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Mar 2024 21:25:10 +0000 Subject: [PATCH 355/438] 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 aa287fd..6d84aeb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -252,7 +252,7 @@ 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 +wheel 0.43.0 python wyz 0.5.1 rust-crate x264-libs 0.164_git20231001-r0 apk x265-libs 3.5-r4 apk From 825b75a9857a795d7a99b8dcd3a5f02102a606e6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Mar 2024 21:20:23 +0000 Subject: [PATCH 356/438] 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 6d84aeb..70bebce 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -97,7 +97,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 @@ -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.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 cc0fdf9c61ccd33e2f4450fa7a72baa4287bbeb0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Mar 2024 21:24:04 +0000 Subject: [PATCH 357/438] 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 70bebce..ac290fd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,8 +23,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 cfg-if 1.0.0 rust-crate cjson 1.7.17-r0 apk clap 4.0.32 rust-crate From 2db08a6be8535868beeb1aa4172971e7105755ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Apr 2024 21:21:22 +0000 Subject: [PATCH 358/438] 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 ac290fd..e2cad32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -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-r1 apk +c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk cfg-if 1.0.0 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.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 @@ -186,7 +186,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 ppv-lite86 0.2.17 rust-crate proc-macro-error 1.0.4 rust-crate From d6d9bfaab36414550f5c19331050a4c3dbbdf305 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Apr 2024 21:21:27 +0000 Subject: [PATCH 359/438] 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 e2cad32..735d113 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ 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 +apk-tools 2.14.3-r1 apk arg_enum_proc_macro 0.3.2 rust-crate arrayvec 0.7.2 rust-crate av-metrics 0.9.0 rust-crate From 4ce1415610a09ebb0c30de93099ebe7b0507e5d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 16 Apr 2024 21:22:48 +0000 Subject: [PATCH 360/438] 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 735d113..b38c443 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-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 @@ -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-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 @@ -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.8-r0 apk -python3 3.11.8-r0 apk -python3-pyc 3.11.8-r0 apk -python3-pycache-pyc0 3.11.8-r0 apk +pyc 3.11.9-r0 apk +python3 3.11.9-r0 apk +python3-pyc 3.11.9-r0 apk +python3-pycache-pyc0 3.11.9-r0 apk quote 1.0.27 rust-crate radium 0.7.0 rust-crate rand 0.8.5 rust-crate @@ -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.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 7d3bd210ebbd463a96d341e2853e7f46e92f1a7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Apr 2024 21:22:36 +0000 Subject: [PATCH 361/438] 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 b38c443..633986c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ 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.3-r1 apk +apk-tools 2.14.4-r0 apk arg_enum_proc_macro 0.3.2 rust-crate arrayvec 0.7.2 rust-crate av-metrics 0.9.0 rust-crate @@ -58,6 +58,7 @@ 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 +findutils 4.9.0-r5 apk fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk fribidi 1.0.13-r0 apk From e08f65fed85ca0dcb1358861c333904e942edb45 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 Apr 2024 21:21:44 +0000 Subject: [PATCH 362/438] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5576cdc..31bfc69 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 master --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 2b73c52194ebebad6555b289c9ecf5a81364f120 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 May 2024 21:22:11 +0000 Subject: [PATCH 363/438] Bot Updating Templated Files --- Jenkinsfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 31bfc69..c7630b3 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 20a8675b91658e83ecc78cae4a46a88ad1010eb8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 May 2024 21:20:48 +0000 Subject: [PATCH 364/438] Bot Updating Templated Files --- Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c7630b3..bb7a593 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 6201c18eb2567695f68c4b3263e73354f5b4c34e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 May 2024 21:25:28 +0000 Subject: [PATCH 365/438] 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 633986c..7b9ae77 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -25,6 +25,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 cfg-if 1.0.0 rust-crate cjson 1.7.17-r0 apk clap 4.0.32 rust-crate @@ -65,7 +66,7 @@ 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 +glib 2.78.6-r0 apk glslang-libs 1.3.261.1-r0 apk graphite2 1.3.14-r6 apk harfbuzz 8.3.0-r0 apk From 2f0f9520fc48e2e95aebbeee7d56f3a02ff04aff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:21:37 +0000 Subject: [PATCH 366/438] Bot Updating Templated Files --- Jenkinsfile | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb7a593..7673f0b 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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + 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-latest") - if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest - fi - docker manifest push --purge ${MANIFESTIMAGE}:latest - 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 4d98f424637ee4fe627f44987fab3ebf636e43d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:23:55 +0000 Subject: [PATCH 367/438] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eca41a..b996a32 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 35beb5b2f25138bc1b5e55a14340fb33dbbff7ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 21:28:12 +0000 Subject: [PATCH 368/438] 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 7b9ae77..7427c08 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -94,7 +94,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 @@ -130,7 +130,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 @@ -147,7 +147,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 @@ -221,7 +221,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.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 9f9cb04f293a76537d85c1b6d765639eb03d68f7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 May 2024 21:23:38 +0000 Subject: [PATCH 369/438] 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 7427c08..f65cdcb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,8 +20,8 @@ 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 +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 @@ -234,7 +234,7 @@ 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 +ssl_client 1.36.1-r18 apk syn 1.0.109 rust-crate syn 2.0.16 rust-crate tap 1.0.1 rust-crate From 0a7e7d988816536364e939461d52bf0747423c8f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 2 Jun 2024 14:29:15 +0000 Subject: [PATCH 370/438] Bot Updating Package Versions --- package_versions.txt | 641 +++++++++++++++++++++++++------------------ 1 file changed, 375 insertions(+), 266 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f65cdcb..eb79b7c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,266 +1,375 @@ -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.4-r0 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-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 -catatonit 0.2.0-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 -findutils 4.9.0-r5 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.6-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.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 -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.3.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.9-r0 apk -python3 3.11.9-r0 apk -python3-pyc 3.11.9-r0 apk -python3-pycache-pyc0 3.11.9-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 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 -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-r18 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.43.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.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-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 +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 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.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.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.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-r18 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.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 From b8cdda767ab5b849cbfb78c981ff4966f474b7f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Jun 2024 21:23:38 +0000 Subject: [PATCH 371/438] 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 eb79b7c..34dbdf4 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 6c982b9e5ba815e716a5cc1cd7d9d70b41d00101 Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Mon, 24 Jun 2024 18:47:33 +0100 Subject: [PATCH 372/438] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 8 ++------ 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index b54ad9d..96c7910 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 118d24a..cc4992e 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 7673f0b..df9bf84 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 b996a32..6cc9793 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.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). * **11.08.23:** - Rebase to Alpine 3.18. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8823ec4..194dc39 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 bbf9664..e24e40d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -22,11 +22,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 opt_param_usage_include_vols: true opt_param_volumes: - {vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies"} @@ -38,7 +33,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: "24.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: "11.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} From b81a6cbc98129572281f8dc9402728db03b5f40a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Jun 2024 14:53:40 +0000 Subject: [PATCH 373/438] Bot Updating Package Versions --- package_versions.txt | 664 +++++++++++++++++++------------------------ 1 file changed, 289 insertions(+), 375 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 34dbdf4..15f84bd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,375 +1,289 @@ -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.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.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 -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.1-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.1 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.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.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.1 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 +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 5191ce82a5cb9a3d2be574836df38c106ae26317 Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Tue, 2 Jul 2024 19:33:22 +0100 Subject: [PATCH 374/438] 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 96c7910..ab814e3 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 cc4992e..7367157 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 e24e40d..0bde643 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -26,6 +26,9 @@ opt_param_usage_include_vols: true opt_param_volumes: - {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"} + +readonly_supported: true + # application setup block app_setup_block_enabled: true app_setup_block: | From 81f37f173033ee5531796e100467d721c3218af0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 2 Jul 2024 21:24:59 +0000 Subject: [PATCH 375/438] 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 15f84bd..c73af61 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,8 +201,8 @@ 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.1 python +pillow 10.4.0 python +pip 24.1.1 python platformdirs 4.2.0 python procps-ng 4.0.4-r0 apk psycopg2-binary 2.9.9 python @@ -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 67fcfe3d7d54579ad6e966b7da10efaf54bfce88 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 9 Jul 2024 21:26:13 +0000 Subject: [PATCH 376/438] 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 c73af61..bf314c9 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 @@ -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 11b095980143dc4f42ec83d7f7b57914ecadd2b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jul 2024 21:25:25 +0000 Subject: [PATCH 377/438] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index df9bf84..7f7ca00 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 5b763a72d63bee6c9411965d3381783302e707ca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jul 2024 21:27:32 +0000 Subject: [PATCH 378/438] 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 6cc9793..e69fe83 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,11 @@ This image provides various versions that are available via tags. Please read th - 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. @@ -125,6 +130,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-v /config` | Persistent config files | | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | +| `--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 5f631bec7c2e2bd77e7ec3308a364bf9939aff66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 Jul 2024 21:32:25 +0000 Subject: [PATCH 379/438] Bot Updating Package Versions --- package_versions.txt | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bf314c9..6c7c1e8 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 @@ -42,8 +44,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 @@ -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 @@ -118,7 +126,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 +164,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 @@ -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 @@ -258,9 +271,12 @@ stevedore 5.2.0 python tdb-libs 1.4.9-r1 apk 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 @@ -275,7 +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 -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 @@ -284,6 +300,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 3a5f24a0536ae98f0eb18630e590cf0c8fe256d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 Jul 2024 21:23:56 +0000 Subject: [PATCH 380/438] 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 6c7c1e8..fa3319b 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.2 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.6.1 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 @@ -275,11 +273,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 @@ -291,6 +290,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 2bb78bab234cb21ab14158cfc5bd684ffd0af630 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 6 Aug 2024 21:26:40 +0000 Subject: [PATCH 381/438] 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 fa3319b..0aef7a3 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 @@ -291,13 +291,14 @@ 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 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 9c2e49dacea5cbed686fc602fc99b5ace6f4476a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 13 Aug 2024 21:24:51 +0000 Subject: [PATCH 382/438] 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 0aef7a3..a192338 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 f966bdeea2dda18355acb4e2b30adea4064bef55 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 21:24:28 +0000 Subject: [PATCH 383/438] Bot Updating Templated Files --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f7ca00..c4ea070 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 = 'master' 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 master",\ "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/latest | jq '. |.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 93030d026ada96aa7695f9388e3e930f46fdf368 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 21:26:41 +0000 Subject: [PATCH 384/438] 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 8948cff..c2b1c0b 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/master' run: | + printf "# External trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER }}" ]; then - echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\". ****" - echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving external version ****" + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\`" >> $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/latest" | jq -r '. | .tag_name') + echo "Type is \`github_stable\`" >> $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 master" 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="latest" 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 latest" 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/master/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/master/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 1a20e70..c2adea3 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/master' run: | + printf "# Package trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\` 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/master/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 master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\". ****" - echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/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 bda6a47e847ef62de9c88c8132f0f11155ba11d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 20 Aug 2024 21:30:09 +0000 Subject: [PATCH 385/438] 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 a192338..12871a6 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.1 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python From 9fe4513f9ce6fe0d181dfc251dd58983eb001785 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Aug 2024 21:24:29 +0000 Subject: [PATCH 386/438] 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 12871a6..e74ada8 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 @@ -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 f092d8d4cceb62dd630c74106e0ceb09d725b242 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Sep 2024 21:25:48 +0000 Subject: [PATCH 387/438] 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 e74ada8..ac16649 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 @@ -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.0.0 python +setuptools 74.1.1 python shaderc 2024.0-r0 apk shadow 4.15.1-r0 apk signalrcore 0.9.5 python @@ -287,7 +287,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 8285ef94acfc2d075c976779edfd2ce2d1196ba2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Sep 2024 21:25:47 +0000 Subject: [PATCH 388/438] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ac16649..6211c36 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 @@ -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 @@ -117,13 +117,13 @@ 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 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 @@ -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 @@ -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 @@ -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 @@ -275,7 +275,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 @@ -287,7 +287,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.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python wheel 0.43.0 python From 10c9e6a7dfe2342d1d03ae76f2ba3be9d51ec6a8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 15 Sep 2024 20:30:45 +0000 Subject: [PATCH 389/438] Bot Updating Package Versions --- package_versions.txt | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6211c36..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 @@ -52,7 +52,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 @@ -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 @@ -105,7 +106,7 @@ jq 1.7.1-r0 apk js2py 0.74 python 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 @@ -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 @@ -139,10 +140,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 +192,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 +213,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 @@ -222,14 +223,14 @@ pyparsing 3.1.1 python pyrsistent 0.20.0 python pysocks 1.7.1 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 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 @@ -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 @@ -266,6 +267,7 @@ 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 From 2e684f8ebfb03b6c21f8921fdc663eed8af80485 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Sep 2024 21:26:51 +0000 Subject: [PATCH 390/438] 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 fe7edfd..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 @@ -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 6ffa978e4e5d1e5a59fbc0e9732009c05d769f30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Sep 2024 21:25:37 +0000 Subject: [PATCH 391/438] 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 01d2ad2..33248c3 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.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 @@ -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 @@ -119,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.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 55482ecb25a3acd2c1fc0ab15749948f95684a82 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Oct 2024 21:26:27 +0000 Subject: [PATCH 392/438] Bot Updating Templated Files --- Jenkinsfile | 60 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c4ea070..2356843 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=\"latest\" \ -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,17 +1027,45 @@ 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,\ - "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,\ - "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"}],\ + }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' + } + } + 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:** '${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} ''' } } From 07156341eb429db98bd35272c58d711b3dca53da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Oct 2024 21:27:51 +0000 Subject: [PATCH 393/438] 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 c2adea3..0000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-master: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Package Trigger - if: github.ref == 'refs/heads/master' - run: | - printf "# Package trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER }}" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\` 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/master/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 master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bazarr/job/master/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 5c70e4dc8003f8ddd1e4f1c6591334d6495bbe01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Oct 2024 21:29:58 +0000 Subject: [PATCH 394/438] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 64 +++++++++++------- .../workflows/package_trigger_scheduler.yml | 66 ++++++++++++++----- README.md | 4 +- 3 files changed, 90 insertions(+), 44 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c2b1c0b..209bab5 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/master' + 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_MASTER }}" ]; then + if grep -q "^bazarr_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bazarr_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BAZARR_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, add \`bazarr_master\` 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/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $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/master/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 latest. 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 latest 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/master/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 latest. 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..85e693e 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 -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} " + 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 e69fe83..3df10e7 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,6 @@ This image provides various versions that are available via tags. Please read th 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. @@ -268,7 +267,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 6378de0afb2426f00809be542468d85045f05e33 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Oct 2024 21:33:27 +0000 Subject: [PATCH 395/438] 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 33248c3..a65abe1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,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 6dbee94ef0117706e526faed25c6a73567444df3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 2 Oct 2024 01:57:34 +0000 Subject: [PATCH 396/438] Bot Updating Package Versions --- package_versions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a65abe1..1f85f47 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 From 1a9b791fee46aa41d7bf2077ae3d18c229c0d7e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 8 Oct 2024 21:28:17 +0000 Subject: [PATCH 397/438] 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 e76f75ef7ec2fe39f2d0faad592b73799291bb3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Oct 2024 21:26:27 +0000 Subject: [PATCH 398/438] 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 885321a22980516f466d39f5cedb3dc720cd8bd7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 22 Oct 2024 21:26:04 +0000 Subject: [PATCH 399/438] 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 37f8ff1..e54b16f 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 @@ -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 @@ -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 @@ -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 33379f33cc874338d7f2918a94b931387f7e73a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 29 Oct 2024 21:28:17 +0000 Subject: [PATCH 400/438] 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 e54b16f..649298f 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 @@ -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 @@ -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 3a9fec6cd49cc02bb26e46a2ec2fe37c58963946 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 5 Nov 2024 21:25:58 +0000 Subject: [PATCH 401/438] 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 dfc2c16ab19f96faab2960d460d0d132b85ed559 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:24:23 +0000 Subject: [PATCH 402/438] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2356843..3715f66 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -894,7 +894,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "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": false}' >> 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 29a5e7a9d05cd4f785276b06ef6d69e4ce15d11b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:26:25 +0000 Subject: [PATCH 403/438] 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 424ab22..0102abc 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 3df10e7..367e9fb 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ This image provides various versions that are available via tags. Please read th - 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/). @@ -283,10 +284,10 @@ docker build \ -t lscr.io/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`. From d5f9d967d664a35f8e93d77514095b0caf4906c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 12 Nov 2024 21:29:36 +0000 Subject: [PATCH 404/438] 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 04c38257974917299ba7fa8ef1c93f68ae919ebc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 19 Nov 2024 21:27:25 +0000 Subject: [PATCH 405/438] 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 22ea3188d584753e837dcfa8b5f063a5cccb244b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 26 Nov 2024 21:27:34 +0000 Subject: [PATCH 406/438] 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 3d605cb..9e85d63 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 @@ -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 c3603b5e0eb938cebd06475f6aa5a832bc2635a9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 21:26:51 +0000 Subject: [PATCH 407/438] Bot Updating Templated Files --- Jenkinsfile | 268 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3715f66..82d9d48 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 = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = '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 = 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/' + 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 = '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}:latest + ls -al ${TEMPDIR}/d2 + yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.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 master + 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 master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + 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://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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}:latest - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:latest - 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}:latest -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-latest -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-latest -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-latest - 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-latest - 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-latest - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-latest - 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}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - 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}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + 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 e364f88b30eace0578ee582ff24d206e29b4ac23 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 21:28:30 +0000 Subject: [PATCH 408/438] Bot Updating Templated Files --- readme-vars.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 0bde643..72e2f9d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,7 +18,7 @@ development_versions_items: 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."} @@ -26,14 +26,55 @@ opt_param_usage_include_vols: true opt_param_volumes: - {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"} - 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:latest": { + 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:latest" <- Base Images # changelog changelogs: - {date: "24.06.24:", desc: "Rebase to Alpine 3.20."} From c3abd5b4c64d59081a594428459a5d231f5c7dd2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 3 Dec 2024 21:30:18 +0000 Subject: [PATCH 409/438] Bot Updating Templated Files --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 367e9fb..f1c8e5e 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ This image provides various versions that are available via tags. Please read th - 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/). @@ -80,6 +79,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 @@ -123,7 +125,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 2787b232bf49ff75a0569786e7ec003455a3ac2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Dec 2024 21:26:55 +0000 Subject: [PATCH 410/438] 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 209bab5..2abfb69 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 7274e84ee2d079f372c34bc3d7fd16cd3e82040d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 10 Dec 2024 21:31:02 +0000 Subject: [PATCH 411/438] 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 09472eafab6bfa595cba782d5777b10379a66b7f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Dec 2024 21:24:51 +0000 Subject: [PATCH 412/438] Bot Updating Templated Files --- Jenkinsfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 82d9d48..3b61194 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -585,7 +585,7 @@ pipeline { --label \"org.opencontainers.image.title=Bazarr\" \ --label \"org.opencontainers.image.description=[Bazarr](https://www.bazarr.media/) 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://www.bazarr.media/) 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://www.bazarr.media/) 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": "master",\ "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": false}' >> 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 cf886e3730eadc852eab74739b9112f192ca8ca7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Dec 2024 21:26:35 +0000 Subject: [PATCH 413/438] 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 2abfb69..fc7a468 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 116dacdedd5c10df89b4eb0be1712bf406eecd8e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 17 Dec 2024 21:30:37 +0000 Subject: [PATCH 414/438] 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 f72825335e9de4f33946055581d9ec2db0b28689 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 24 Dec 2024 15:31:51 +0000 Subject: [PATCH 415/438] 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 9ee3fc7fbdc04fa1dd35c6fcae18c31dd2e6d663 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 24 Dec 2024 16:08:10 +0000 Subject: [PATCH 416/438] 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 | 7 ++++--- root/etc/s6-overlay/s6-rc.d/svc-bazarr/run | 12 +++++++++--- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab814e3..290dd86 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 7367157..ab91d28 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 f1c8e5e..699c3d1 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,10 @@ This image provides various versions that are available via tags. Please read th 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. @@ -133,6 +137,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-v /movies` | Location of your movies | | `-v /tv` | Location of your TV Shows | | `--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) @@ -296,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.12.24:** - Rebase to Alpine 3.21. * **24.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 72e2f9d..95e24e0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -27,6 +27,7 @@ opt_param_volumes: - {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"} readonly_supported: true +nonroot_supported: true # application setup block app_setup_block_enabled: true app_setup_block: | @@ -77,6 +78,7 @@ init_diagram: | "bazarr:latest" <- Base Images # changelog changelogs: + - {date: "24.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "24.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 ae4017a..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,6 +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 8581337..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,6 +1,12 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -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 +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 3ba1ff9577dd2561c21a65d0545afc0c3040f7e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 25 Dec 2024 22:12:08 +0000 Subject: [PATCH 417/438] 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 95e24e0..f6f1838 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,28 +52,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:latest" <- Base Images # changelog From 25907057728213673f8a40855762ad89d8cdc2b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 25 Dec 2024 22:16:20 +0000 Subject: [PATCH 418/438] 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 d1fecce2549672568126ab209f0cb00965d3b4ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 31 Dec 2024 21:26:44 +0000 Subject: [PATCH 419/438] 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 f575256c194ea5125384cf86eaef55d4eae4cda3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 1 Jan 2025 16:38:22 +0000 Subject: [PATCH 420/438] 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 9d18700dd361f4b835ec4f827ed923322ada8a13 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 7 Jan 2025 21:27:09 +0000 Subject: [PATCH 421/438] 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 From dcb5ad04541ea55d2a1eedc36f1bd49477a7a193 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 14 Jan 2025 21:29:05 +0000 Subject: [PATCH 422/438] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 86fa018..c6ef6b9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alembic 1.13.1 python 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 +alpine-release 3.21.2-r0 apk alsa-lib 1.2.12-r0 apk aniso8601 9.0.1 python aom-libs 3.11.0-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 20241121-r0 apk -ca-certificates-bundle 20241121-r0 apk +ca-certificates 20241121-r1 apk +ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk certifi 2024.2.2 python chardet 5.2.0 python @@ -39,10 +39,10 @@ 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 +coreutils 9.5-r2 apk +coreutils-env 9.5-r2 apk +coreutils-fmt 9.5-r2 apk +coreutils-sha512sum 9.5-r2 apk curl 8.11.1-r0 apk dbus-libs 1.14.10-r4 apk decorator 5.1.1 python @@ -112,7 +112,7 @@ 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 +libblkid 2.40.4-r0 apk libbluray 1.3.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk @@ -138,7 +138,7 @@ 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 +libmount 2.40.4-r0 apk libncursesw 6.5_p20241006-r3 apk libogg 1.3.5-r5 apk libopenmpt 0.7.12-r0 apk @@ -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.7.0 python +setuptools 75.8.0 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python From d696d60999796c8b97021df643b9884a0cc2ae03 Mon Sep 17 00:00:00 2001 From: quietsy <github@qtsy.cc> Date: Mon, 20 Jan 2025 17:20:53 +0200 Subject: [PATCH 423/438] Add categories to readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index f6f1838..2474560 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,6 +6,7 @@ project_url: "https://www.bazarr.media/" 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 }}" +project_categories: "Media Management" # supported architectures available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} From 2e437148aba1ac2d1e519d669e424b10be52af8e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 Jan 2025 02:45:56 +0000 Subject: [PATCH 424/438] 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 c6ef6b9..8d681eb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -25,8 +25,8 @@ 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 +busybox 1.37.0-r12 apk +busybox-binsh 1.37.0-r12 apk c-ares 1.34.3-r0 apk ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk @@ -195,7 +195,7 @@ 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 +numpy 2.2.2 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -264,7 +264,7 @@ 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 +ssl_client 1.37.0-r12 apk stevedore 5.2.0 python tdb-libs 1.4.12-r0 apk textdistance 4.6.2 python From 2d96a825e8a402f0df0996c60341d1b4d4d0a86a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Jan 2025 21:24:39 +0000 Subject: [PATCH 425/438] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b61194..a2dbb74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,11 +59,21 @@ pipeline { steps{ echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash - containers=$(docker ps -aq) + echo "Pruning builder" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : ''' + docker system prune -f --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -1162,12 +1172,21 @@ EOF } cleanup { sh '''#! /bin/bash - echo "Performing docker system prune!!" - containers=$(docker ps -aq) + echo "Pruning builder!!" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : ''' cleanWs() } From a5e47e7795a6427fc2edf12c6fa416679ff335e9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Jan 2025 21:27:13 +0000 Subject: [PATCH 426/438] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/external_trigger.yml | 10 +++++++++- README.md | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0102abc..1b3ed2a 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ * Read, and fill the Pull Request template * 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 #\<issue number>, 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) +* 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://linuxserver.io/discord) ## Common files diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 6ba8f84..7543866 100755 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discord chat support - url: https://discord.gg/YWrKVTn + url: https://linuxserver.io/discord about: Realtime support / chat with the community and the team. - name: Discourse discussion forum diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index fc7a468..31036b0 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -15,7 +15,10 @@ jobs: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-bazarr\n\n" >> $GITHUB_STEP_SUMMARY - if grep -q "^bazarr_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^bazarr_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bazarr_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY + elif grep -q "^bazarr_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bazarr_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 @@ -25,6 +28,11 @@ jobs: 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/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY + if grep -q "^bazarr_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY + exit 0 + fi if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY diff --git a/README.md b/README.md index 699c3d1..20e99f2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![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!") -[![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.") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "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.") @@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r 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. +* [Discord](https://linuxserver.io/discord) - 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. From 0e55aa723cc0629c06f46eb3a9a07f96cd227ef3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 28 Jan 2025 21:31:28 +0000 Subject: [PATCH 427/438] 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 8d681eb..fa5f6c7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -208,7 +208,7 @@ orc 0.4.40-r1 apk packaging 24.2 python pcre2 10.43-r0 apk pillow 11.1.0 python -pip 24.3.1 python +pip 25.0 python platformdirs 4.2.0 python platformdirs 4.2.2 python procps-ng 4.0.4-r2 apk From 640c5d0f58ec05df06659071147cbebba587f0de Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Feb 2025 21:24:08 +0000 Subject: [PATCH 428/438] Bot Updating Templated Files --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a2dbb74..57d9c26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -761,7 +763,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1187,6 +1190,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } From 9fa68baf9d3585c071d859c4e49fd511861162b0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Feb 2025 21:27:47 +0000 Subject: [PATCH 429/438] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fa5f6c7..d356368 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.11.1-r0 apk +curl 8.12.0-r0 apk dbus-libs 1.14.10-r4 apk decorator 5.1.1 python deep-translator 1.11.4 python @@ -116,8 +116,8 @@ libblkid 2.40.4-r0 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 +libcrypto3 3.3.3-r0 apk +libcurl 8.12.0-r0 apk libdav1d 1.5.0-r0 apk libdeflate 1.22-r0 apk libdovi 3.3.1-r0 apk @@ -155,7 +155,7 @@ libsndfile 1.2.2-r2 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 +libssl3 3.3.3-r0 apk libstdc++ 14.2.0-r4 apk libtheora 1.1.1-r18 apk libunibreak 6.1-r0 apk @@ -208,12 +208,12 @@ orc 0.4.40-r1 apk packaging 24.2 python pcre2 10.43-r0 apk pillow 11.1.0 python -pip 25.0 python +pip 25.0.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 +pyc 3.12.9-r0 apk pycountry 23.12.11 python pydantic 1.10.14 python pygments 2.17.2 python @@ -228,9 +228,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.8-r1 apk -python3-pyc 3.12.8-r1 apk -python3-pycache-pyc0 3.12.8-r1 apk +python3 3.12.9-r0 apk +python3-pyc 3.12.9-r0 apk +python3-pycache-pyc0 3.12.9-r0 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python @@ -261,7 +261,7 @@ 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 +sqlite-libs 3.48.0-r0 apk sratom 0.6.16-r0 apk srt 3.5.3 python ssl_client 1.37.0-r12 apk From 656e0796dc553f7f5c72e5256e90337512c77737 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Feb 2025 21:26:00 +0000 Subject: [PATCH 430/438] 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 d356368..e612b70 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,11 +5,11 @@ alembic 1.13.1 python 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.2-r0 apk +alpine-release 3.21.3-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 +apk-tools 2.14.6-r3 apk appdirs 1.4.4 python apprise 1.7.6 python apscheduler 3.10.4 python @@ -43,7 +43,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.12.0-r0 apk +curl 8.12.1-r0 apk dbus-libs 1.14.10-r4 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.3-r0 apk -libcurl 8.12.0-r0 apk +libcurl 8.12.1-r0 apk libdav1d 1.5.0-r0 apk libdeflate 1.22-r0 apk libdovi 3.3.1-r0 apk @@ -188,14 +188,14 @@ 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 +musl 1.2.5-r9 apk +musl-utils 1.2.5-r9 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.2 python +numpy 2.2.3 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -277,7 +277,7 @@ 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 +tzdata 2025a-r0 apk tzlocal 5.2 python unidecode 1.3.8 python urllib3 2.2.1 python From 66d37b4a31373d2e4c7ef54add4d1b8239af7a5f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Feb 2025 21:28:30 +0000 Subject: [PATCH 431/438] 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 e612b70..04f2ad6 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.24-r0 apk giflib 5.2.2-r0 apk -glib 2.82.4-r0 apk +glib 2.82.5-r0 apk glslang-libs 1.3.296.0-r0 apk graphite2 1.3.14-r6 apk guess-language-spirit 0.5.3 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.8.0 python +setuptools 75.8.1 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python @@ -259,7 +259,7 @@ 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 +spirv-tools 1.3.296.0-r0 apk sqlalchemy 2.0.27 python sqlite-libs 3.48.0-r0 apk sratom 0.6.16-r0 apk From 3caad64e72964777832524ba526223be874f048e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 4 Mar 2025 21:26:57 +0000 Subject: [PATCH 432/438] 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 04f2ad6..4880165 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -124,7 +124,7 @@ 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 +libffi 3.4.7-r0 apk libflac 1.4.3-r1 apk libgcc 14.2.0-r4 apk libgcrypt 1.10.3-r1 apk @@ -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.8.1 python +setuptools 75.8.2 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python From cfcacd58ee5c3fdd84a08420af5462101557924a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Mar 2025 21:23:49 +0000 Subject: [PATCH 433/438] 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 4880165..2830ceb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,7 +87,7 @@ 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 +hwdata-pci 0.393-r0 apk idna 3.6 python imath 3.1.12-r0 apk importlib-metadata 7.0.1 python @@ -172,7 +172,7 @@ 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 +libxml2 2.13.4-r5 apk libxslt 1.1.42-r1 apk libzen 0.4.41-r0 apk libzmq 4.3.5-r2 apk @@ -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.8.2 python +setuptools 76.0.0 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python From 15e0f79dff4a8549d9b427c9b75a37a79bcd5b1f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 18 Mar 2025 21:29:50 +0000 Subject: [PATCH 434/438] 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 2830ceb..7df93f3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -123,7 +123,7 @@ 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 +libexpat 2.7.0-r0 apk libffi 3.4.7-r0 apk libflac 1.4.3-r1 apk libgcc 14.2.0-r4 apk @@ -134,7 +134,7 @@ 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 +libjxl 0.10.4-r0 apk libltdl 2.4.7-r3 apk libmd 1.1.0-r0 apk libmediainfo 24.11-r0 apk @@ -145,7 +145,7 @@ 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 +libpng 1.6.47-r0 apk libproc2 4.0.4-r2 apk libpsl 0.21.5-r3 apk libpulse 17.0-r4 apk @@ -173,7 +173,7 @@ libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk libxfixes 6.0.1-r4 apk libxml2 2.13.4-r5 apk -libxslt 1.1.42-r1 apk +libxslt 1.1.42-r2 apk libzen 0.4.41-r0 apk libzmq 4.3.5-r2 apk lilv-libs 0.24.24-r1 apk @@ -195,7 +195,7 @@ 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.3 python +numpy 2.2.4 python oauthlib 3.2.2 python onevpl-libs 2023.3.1-r2 apk oniguruma 6.9.9-r0 apk @@ -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 76.0.0 python +setuptools 76.1.0 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python From d696e42e52908f637799c37aa2b49f06c8211453 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 25 Mar 2025 21:27:34 +0000 Subject: [PATCH 435/438] 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 7df93f3..4b40faa 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.12.1-r0 apk +curl 8.12.1-r1 apk dbus-libs 1.14.10-r4 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.3-r0 apk -libcurl 8.12.1-r0 apk +libcurl 8.12.1-r1 apk libdav1d 1.5.0-r0 apk libdeflate 1.22-r0 apk libdovi 3.3.1-r0 apk @@ -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 76.1.0 python +setuptools 78.0.2 python shaderc 2024.0-r2 apk shadow 4.16.0-r1 apk signalrcore 0.9.5 python @@ -292,8 +292,7 @@ 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 +wheel 0.45.1 python (+1 duplicate) whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164.3108-r0 apk From 0659a474dae365c746405edd8ce09dd787d4b1b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 1 Apr 2025 21:28:39 +0000 Subject: [PATCH 436/438] Bot Updating Package Versions --- package_versions.txt | 613 +++++++++++++++++++++---------------------- 1 file changed, 306 insertions(+), 307 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4b40faa..30ed3e4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,307 +1,306 @@ -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-r1 apk -alpine-baselayout-data 3.6.8-r1 apk -alpine-keys 2.5-r0 apk -alpine-release 3.21.3-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-r3 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-r12 apk -busybox-binsh 1.37.0-r12 apk -c-ares 1.34.3-r0 apk -ca-certificates 20241121-r1 apk -ca-certificates-bundle 20241121-r1 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-r2 apk -coreutils-env 9.5-r2 apk -coreutils-fmt 9.5-r2 apk -coreutils-sha512sum 9.5-r2 apk -curl 8.12.1-r1 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.5-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.393-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.4-r0 apk -libbluray 1.3.4-r1 apk -libbsd 0.12.2-r0 apk -libbz2 1.0.8-r6 apk -libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r1 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.7.0-r0 apk -libffi 3.4.7-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.4-r0 apk -libltdl 2.4.7-r3 apk -libmd 1.1.0-r0 apk -libmediainfo 24.11-r0 apk -libmount 2.40.4-r0 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.47-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-r2 apk -libsodium 1.0.20-r0 apk -libsrt 1.5.3-r0 apk -libssh 0.11.1-r0 apk -libssl3 3.3.3-r0 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-r5 apk -libxslt 1.1.42-r2 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-r9 apk -musl-utils 1.2.5-r9 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.4 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.1.0 python -pip 25.0.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.9-r0 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.9-r0 apk -python3-pyc 3.12.9-r0 apk -python3-pycache-pyc0 3.12.9-r0 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 78.0.2 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.296.0-r0 apk -sqlalchemy 2.0.27 python -sqlite-libs 3.48.0-r0 apk -sratom 0.6.16-r0 apk -srt 3.5.3 python -ssl_client 1.37.0-r12 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 2025a-r0 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.45.1 python (+1 duplicate) -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-r2 apk +NAME VERSION TYPE +acl-libs 2.3.2-r1 apk +alembic 1.13.1 python +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.3-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-r3 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-r12 apk +busybox-binsh 1.37.0-r12 apk +c-ares 1.34.3-r0 apk +ca-certificates 20241121-r1 apk +ca-certificates-bundle 20241121-r1 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-r2 apk +coreutils-env 9.5-r2 apk +coreutils-fmt 9.5-r2 apk +coreutils-sha512sum 9.5-r2 apk +curl 8.12.1-r1 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.5-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.393-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.4-r0 apk +libbluray 1.3.4-r1 apk +libbsd 0.12.2-r0 apk +libbz2 1.0.8-r6 apk +libcrypto3 3.3.3-r0 apk +libcurl 8.12.1-r1 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.7.0-r0 apk +libffi 3.4.7-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.4-r0 apk +libltdl 2.4.7-r3 apk +libmd 1.1.0-r0 apk +libmediainfo 24.11-r0 apk +libmount 2.40.4-r0 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.47-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-r2 apk +libsodium 1.0.20-r0 apk +libsrt 1.5.3-r0 apk +libssh 0.11.1-r0 apk +libssl3 3.3.3-r0 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-r5 apk +libxslt 1.1.42-r2 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-r9 apk +musl-utils 1.2.5-r9 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.4 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.2.0 python +pip 25.0.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.9-r0 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.9-r0 apk +python3-pyc 3.12.9-r0 apk +python3-pycache-pyc0 3.12.9-r0 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 78.1.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.296.0-r0 apk +sqlalchemy 2.0.27 python +sqlite-libs 3.48.0-r0 apk +sratom 0.6.16-r0 apk +srt 3.5.3 python +ssl_client 1.37.0-r12 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 2025b-r0 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.45.1 python (+1 duplicate) +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-r2 apk From 499d9461d4736fd4b351be51b9207a1a7e1ab49d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 8 Apr 2025 21:28:39 +0000 Subject: [PATCH 437/438] Bot Updating Package Versions --- package_versions.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 30ed3e4..e9990ec 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -181,7 +181,7 @@ 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 +mbedtls 3.6.3-r0 apk mediainfo 24.11-r0 apk more-itertools 10.3.0 python mpdecimal 4.0.0-r0 apk @@ -204,9 +204,9 @@ 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 +packaging 24.2 python (+1 duplicate) pcre2 10.43-r0 apk -pillow 11.2.0 python +pillow 11.1.0 python pip 25.0.1 python platformdirs 4.2.0 python platformdirs 4.2.2 python @@ -291,13 +291,14 @@ webencodings 0.5.1 python webrtcvad-wheels 2.0.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python -wheel 0.45.1 python (+1 duplicate) +wheel 0.45.1 python +wheel 0.46.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 +xz-libs 5.6.3-r1 apk zimg 3.0.5-r2 apk zipp 3.17.0 python zipp 3.19.2 python From de1465f981801aaef50c3a51011dc1ec693527a4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 15 Apr 2025 21:28:20 +0000 Subject: [PATCH 438/438] Bot Updating Package Versions --- package_versions.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e9990ec..5881f3d 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.37.0-r12 apk busybox-binsh 1.37.0-r12 apk -c-ares 1.34.3-r0 apk +c-ares 1.34.5-r0 apk ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk @@ -77,7 +77,7 @@ 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 +giflib 5.2.2-r1 apk glib 2.82.5-r0 apk glslang-libs 1.3.296.0-r0 apk graphite2 1.3.14-r6 apk @@ -204,15 +204,15 @@ 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 (+1 duplicate) +packaging 24.2 python pcre2 10.43-r0 apk -pillow 11.1.0 python +pillow 11.2.1 python pip 25.0.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.9-r0 apk +pyc 3.12.10-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.9-r0 apk -python3-pyc 3.12.9-r0 apk -python3-pycache-pyc0 3.12.9-r0 apk +python3 3.12.10-r0 apk +python3-pyc 3.12.10-r0 apk +python3-pycache-pyc0 3.12.10-r0 apk pytz 2024.1 python pytz-deprecation-shim 0.1.0.post0 python pyyaml 6.0.1 python @@ -260,7 +260,7 @@ soxr 0.1.3-r7 apk speexdsp 1.2.1-r2 apk spirv-tools 1.3.296.0-r0 apk sqlalchemy 2.0.27 python -sqlite-libs 3.48.0-r0 apk +sqlite-libs 3.48.0-r1 apk sratom 0.6.16-r0 apk srt 3.5.3 python ssl_client 1.37.0-r12 apk @@ -291,8 +291,7 @@ webencodings 0.5.1 python webrtcvad-wheels 2.0.14 python websocket-client 1.7.0 python werkzeug 3.0.1 python -wheel 0.45.1 python -wheel 0.46.1 python +wheel 0.45.1 python (+1 duplicate) whichcraft 0.6.1 python wsproto 1.2.0 python x264-libs 0.164.3108-r0 apk