Compare commits

...

9 Commits

Author SHA1 Message Date
LinuxServer-CI
924bf59734 Bot Updating Package Versions 2025-02-16 06:56:41 +00:00
LinuxServer-CI
d8ba14010a Bot Updating Templated Files 2025-02-16 06:51:51 +00:00
LinuxServer-CI
d630c2884c Bot Updating Package Versions 2025-02-09 06:51:16 +00:00
LinuxServer-CI
99b422c78a Bot Updating Templated Files 2025-02-04 18:24:25 +00:00
Adam
feace91f16 Merge pull request #370 from linuxserver/port-fix-libtorrent
Fix port in readme (libtorrentv1)
2025-02-04 18:22:44 +00:00
LinuxServer-CI
539cb0dde5 Bot Updating Templated Files 2025-02-02 06:53:02 +00:00
LinuxServer-CI
e5bbf12f75 Bot Updating Templated Files 2025-02-02 06:51:22 +00:00
thespad
51e8763a91 Fix port in readme 2025-01-30 11:38:49 +00:00
LinuxServer-CI
c7e11607fd Bot Updating Package Versions 2025-01-19 06:51:44 +00:00
7 changed files with 65 additions and 34 deletions

View File

@@ -6,7 +6,7 @@
* Read, and fill the Pull Request template * 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 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 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 ## Common files

View File

@@ -1,7 +1,7 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Discord chat support - name: Discord chat support
url: https://discord.gg/YWrKVTn url: https://linuxserver.io/discord
about: Realtime support / chat with the community and the team. about: Realtime support / chat with the community and the team.
- name: Discourse discussion forum - name: Discourse discussion forum

View File

@@ -15,7 +15,10 @@ jobs:
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
run: | run: |
printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY printf "# External trigger for docker-qbittorrent\n\n" >> $GITHUB_STEP_SUMMARY
if grep -q "^qbittorrent_libtorrentv1" <<< "${SKIP_EXTERNAL_TRIGGER}"; then if grep -q "^qbittorrent_libtorrentv1_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
elif grep -q "^qbittorrent_libtorrentv1" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1\`; skipping trigger." >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
exit 0 exit 0
@@ -25,6 +28,11 @@ jobs:
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)') EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)')
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
if grep -q "^qbittorrent_libtorrentv1_${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 if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY

39
Jenkinsfile vendored
View File

@@ -56,11 +56,23 @@ pipeline {
steps{ steps{
echo "Running on node: ${NODE_NAME}" echo "Running on node: ${NODE_NAME}"
sh '''#! /bin/bash sh '''#! /bin/bash
containers=$(docker ps -aq) echo "Pruning builder"
docker builder prune -f --builder container || :
containers=$(docker ps -q)
if [[ -n "${containers}" ]]; then 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 fi
docker system prune -af --volumes || : ''' docker system prune -f --volumes || :
docker image prune -af || :
'''
script{ script{
env.EXIT_STATUS = '' env.EXIT_STATUS = ''
env.LS_RELEASE = sh( env.LS_RELEASE = sh(
@@ -741,7 +753,8 @@ pipeline {
if [[ -n "${containers}" ]]; then if [[ -n "${containers}" ]]; then
docker stop ${containers} docker stop ${containers}
fi fi
docker system prune -af --volumes || : docker system prune -f --volumes || :
docker image prune -af || :
''' '''
} }
} }
@@ -1152,12 +1165,22 @@ EOF
} }
cleanup { cleanup {
sh '''#! /bin/bash sh '''#! /bin/bash
echo "Performing docker system prune!!" echo "Pruning builder!!"
containers=$(docker ps -aq) docker builder prune -f --builder container || :
containers=$(docker ps -q)
if [[ -n "${containers}" ]]; then 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 fi
docker system prune -af --volumes || : docker system prune -f --volumes || :
docker image prune -af || :
''' '''
cleanWs() cleanWs()
} }

View File

@@ -3,7 +3,7 @@
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![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!") [![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.") [![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.") [![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.") [![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: 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! * [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. * [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. * [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. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -78,7 +78,7 @@ If you are running a very old (3.x) kernel you may run into [this issue](https:/
Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port. Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090 For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
### TORRENTING_PORT ### TORRENTING_PORT

View File

@@ -178,12 +178,12 @@ acl-libs 2.3.2-r1
alpine-baselayout 3.6.8-r1 apk alpine-baselayout 3.6.8-r1 apk
alpine-baselayout-data 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk
alpine-keys 2.5-r0 apk alpine-keys 2.5-r0 apk
alpine-release 3.21.2-r0 apk alpine-release 3.21.3-r0 apk
apk-tools 2.14.6-r2 apk apk-tools 2.14.6-r3 apk
bash 5.2.37-r0 apk bash 5.2.37-r0 apk
brotli-libs 1.1.0-r2 apk brotli-libs 1.1.0-r2 apk
busybox 1.37.0-r9 apk busybox 1.37.0-r12 apk
busybox-binsh 1.37.0-r9 apk busybox-binsh 1.37.0-r12 apk
c-ares 1.34.3-r0 apk c-ares 1.34.3-r0 apk
ca-certificates 20241121-r1 apk ca-certificates 20241121-r1 apk
ca-certificates-bundle 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk
@@ -192,7 +192,7 @@ coreutils 9.5-r2
coreutils-env 9.5-r2 apk coreutils-env 9.5-r2 apk
coreutils-fmt 9.5-r2 apk coreutils-fmt 9.5-r2 apk
coreutils-sha512sum 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk
curl 8.11.1-r0 apk curl 8.12.1-r0 apk
dbus-libs 1.14.10-r4 apk dbus-libs 1.14.10-r4 apk
double-conversion 3.3.0-r0 apk double-conversion 3.3.0-r0 apk
duktape 2.7.0-r1 apk duktape 2.7.0-r1 apk
@@ -205,11 +205,11 @@ icu-libs 74.2-r0
jq 1.7.1-r0 apk jq 1.7.1-r0 apk
libattr 2.5.2-r2 apk libattr 2.5.2-r2 apk
libb2 0.98.1-r3 apk libb2 0.98.1-r3 apk
libblkid 2.40.2-r4 apk libblkid 2.40.4-r0 apk
libbsd 0.12.2-r0 apk libbsd 0.12.2-r0 apk
libbz2 1.0.8-r6 apk libbz2 1.0.8-r6 apk
libcrypto3 3.3.2-r4 apk libcrypto3 3.3.3-r0 apk
libcurl 8.11.1-r0 apk libcurl 8.12.1-r0 apk
libeconf 0.6.3-r0 apk libeconf 0.6.3-r0 apk
libexpat 2.6.4-r0 apk libexpat 2.6.4-r0 apk
libffi 3.4.6-r0 apk libffi 3.4.6-r0 apk
@@ -218,21 +218,21 @@ libgomp 14.2.0-r4
libidn2 2.3.7-r0 apk libidn2 2.3.7-r0 apk
libintl 0.22.5-r0 apk libintl 0.22.5-r0 apk
libmd 1.1.0-r0 apk libmd 1.1.0-r0 apk
libmount 2.40.2-r4 apk libmount 2.40.4-r0 apk
libncursesw 6.5_p20241006-r3 apk libncursesw 6.5_p20241006-r3 apk
libpanelw 6.5_p20241006-r3 apk libpanelw 6.5_p20241006-r3 apk
libpcre2-16 10.43-r0 apk libpcre2-16 10.43-r0 apk
libproc2 4.0.4-r2 apk libproc2 4.0.4-r2 apk
libproxy 0.5.9-r0 apk libproxy 0.5.9-r0 apk
libpsl 0.21.5-r3 apk libpsl 0.21.5-r3 apk
libssl3 3.3.2-r4 apk libssl3 3.3.3-r0 apk
libstdc++ 14.2.0-r4 apk libstdc++ 14.2.0-r4 apk
libunistring 1.2-r0 apk libunistring 1.2-r0 apk
linux-pam 1.6.1-r1 apk linux-pam 1.6.1-r1 apk
mpdecimal 4.0.0-r0 apk mpdecimal 4.0.0-r0 apk
mscorlib 6.0.3524.45918 dotnet mscorlib 6.0.3524.45918 dotnet
musl 1.2.5-r8 apk musl 1.2.5-r9 apk
musl-utils 1.2.5-r8 apk musl-utils 1.2.5-r9 apk
ncurses-terminfo-base 6.5_p20241006-r3 apk ncurses-terminfo-base 6.5_p20241006-r3 apk
netcat-openbsd 1.226.1.1-r0 apk netcat-openbsd 1.226.1.1-r0 apk
netstandard 6.0.3524.45918 dotnet netstandard 6.0.3524.45918 dotnet
@@ -240,10 +240,10 @@ nghttp2-libs 1.64.0-r0
oniguruma 6.9.9-r0 apk oniguruma 6.9.9-r0 apk
pcre2 10.43-r0 apk pcre2 10.43-r0 apk
procps-ng 4.0.4-r2 apk procps-ng 4.0.4-r2 apk
pyc 3.12.8-r1 apk pyc 3.12.9-r0 apk
python3 3.12.8-r1 apk python3 3.12.9-r0 apk
python3-pyc 3.12.8-r1 apk python3-pyc 3.12.9-r0 apk
python3-pycache-pyc0 3.12.8-r1 apk python3-pycache-pyc0 3.12.9-r0 apk
qbt 1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2 dotnet qbt 1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2 dotnet
qt6-qtbase 6.8.0-r1 apk qt6-qtbase 6.8.0-r1 apk
qt6-qtbase-sqlite 6.8.0-r1 apk qt6-qtbase-sqlite 6.8.0-r1 apk
@@ -251,9 +251,9 @@ readline 8.2.13-r0
scanelf 1.3.8-r1 apk scanelf 1.3.8-r1 apk
shadow 4.16.0-r1 apk shadow 4.16.0-r1 apk
skalibs-libs 2.14.3.0-r0 apk skalibs-libs 2.14.3.0-r0 apk
sqlite-libs 3.47.1-r0 apk sqlite-libs 3.48.0-r0 apk
ssl_client 1.37.0-r9 apk ssl_client 1.37.0-r12 apk
tzdata 2024b-r1 apk tzdata 2025a-r0 apk
utmps-libs 0.1.2.3-r2 apk utmps-libs 0.1.2.3-r2 apk
xz-libs 5.6.3-r0 apk xz-libs 5.6.3-r0 apk
zlib 1.3.1-r2 apk zlib 1.3.1-r2 apk

View File

@@ -48,7 +48,7 @@ app_setup_block: |
Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port. Due to issues with CSRF and port mapping, should you require to alter the port for the web UI you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090 For example, to set the port to 8123 you need to set -p 8123:8123 and -e WEBUI_PORT=8123
### TORRENTING_PORT ### TORRENTING_PORT