Compare commits
9 Commits
libtorrent
...
libtorrent
| Author | SHA1 | Date | |
|---|---|---|---|
|
539cb0dde5 | ||
|
|
e5bbf12f75 | ||
|
|
c7e11607fd | ||
|
|
5fcd99d999 | ||
|
|
e68221b2c9 | ||
|
|
a98b645e63 | ||
|
|
b20d69c731 | ||
|
|
86351818ad | ||
|
|
e23604ae59 |
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@@ -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
|
||||
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -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
|
||||
|
||||
10
.github/workflows/external_trigger.yml
vendored
10
.github/workflows/external_trigger.yml
vendored
@@ -15,7 +15,10 @@ jobs:
|
||||
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
|
||||
run: |
|
||||
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 "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`qbittorrent_libtorrentv1\`; 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 }} -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
|
||||
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
|
||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
33
Jenkinsfile
vendored
33
Jenkinsfile
vendored
@@ -56,11 +56,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(
|
||||
@@ -1152,12 +1162,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()
|
||||
}
|
||||
|
||||
10
README.md
10
README.md
@@ -3,7 +3,7 @@
|
||||
[](https://linuxserver.io)
|
||||
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](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.
|
||||
@@ -90,6 +90,10 @@ Similarly to the WEBUI_PORT, to set the port to 6887 you need to pass -p 6887:68
|
||||
|
||||
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.
|
||||
@@ -157,6 +161,7 @@ Containers are configured using parameters passed at runtime (such as those abov
|
||||
| `-v /config` | Contains all relevant configuration files. |
|
||||
| `-v /downloads` | Location of downloads on disk. |
|
||||
| `--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)
|
||||
|
||||
@@ -320,6 +325,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **20.12.24:** - Rebase to Alpine 3.21.
|
||||
* **17.07.24:** - Restore qbittorrent-cli as it now supports openssl 3.
|
||||
* **25.05.24:** - Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL.
|
||||
* **14.02.24:** - Only set/override torrenting port if the optional env var is set.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
NAME VERSION TYPE
|
||||
7zip 23.01-r0 apk
|
||||
7zip 24.08-r0 apk
|
||||
Alba.CsConsoleFormat 1.0.0.89 dotnet
|
||||
BencodeNET 2.3.0.0 dotnet
|
||||
Bouncy Castle for .NET (netstandard2.0) 1.8.8.2 dotnet
|
||||
@@ -174,87 +174,87 @@ System.Xml.XPath.XDocument 6.0.3524.45918
|
||||
System.Xml.XmlDocument 6.0.3524.45918 dotnet
|
||||
System.Xml.XmlSerializer 6.0.3524.45918 dotnet
|
||||
WindowsBase 6.0.3524.45918 dotnet
|
||||
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
|
||||
apk-tools 2.14.4-r1 apk
|
||||
bash 5.2.26-r0 apk
|
||||
acl-libs 2.3.2-r1 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.2-r0 apk
|
||||
apk-tools 2.14.6-r2 apk
|
||||
bash 5.2.37-r0 apk
|
||||
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
|
||||
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
|
||||
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-r1 apk
|
||||
dbus-libs 1.14.10-r4 apk
|
||||
double-conversion 3.3.0-r0 apk
|
||||
duktape 2.7.0-r1 apk
|
||||
findutils 4.9.0-r5 apk
|
||||
gdbm 1.23-r1 apk
|
||||
glib 2.80.5-r0 apk
|
||||
findutils 4.10.0-r0 apk
|
||||
gdbm 1.24-r0 apk
|
||||
glib 2.82.4-r0 apk
|
||||
grep 3.11-r0 apk
|
||||
icu-data-en 74.2-r0 apk
|
||||
icu-libs 74.2-r0 apk
|
||||
jq 1.7.1-r0 apk
|
||||
libacl 2.3.2-r0 apk
|
||||
libattr 2.5.2-r0 apk
|
||||
libattr 2.5.2-r2 apk
|
||||
libb2 0.98.1-r3 apk
|
||||
libblkid 2.40.1-r1 apk
|
||||
libblkid 2.40.4-r0 apk
|
||||
libbsd 0.12.2-r0 apk
|
||||
libbz2 1.0.8-r6 apk
|
||||
libcrypto3 3.3.2-r1 apk
|
||||
libcrypto3 3.3.2-r4 apk
|
||||
libcurl 8.11.1-r0 apk
|
||||
libeconf 0.6.3-r0 apk
|
||||
libexpat 2.6.4-r0 apk
|
||||
libffi 3.4.6-r0 apk
|
||||
libgcc 13.2.1_git20240309-r0 apk
|
||||
libgomp 13.2.1_git20240309-r0 apk
|
||||
libgcc 14.2.0-r4 apk
|
||||
libgomp 14.2.0-r4 apk
|
||||
libidn2 2.3.7-r0 apk
|
||||
libintl 0.22.5-r0 apk
|
||||
libmd 1.1.0-r0 apk
|
||||
libmount 2.40.1-r1 apk
|
||||
libncursesw 6.4_p20240420-r2 apk
|
||||
libpanelw 6.4_p20240420-r2 apk
|
||||
libmount 2.40.4-r0 apk
|
||||
libncursesw 6.5_p20241006-r3 apk
|
||||
libpanelw 6.5_p20241006-r3 apk
|
||||
libpcre2-16 10.43-r0 apk
|
||||
libproc2 4.0.4-r0 apk
|
||||
libproxy 0.5.6-r0 apk
|
||||
libpsl 0.21.5-r1 apk
|
||||
libssl3 3.3.2-r1 apk
|
||||
libstdc++ 13.2.1_git20240309-r0 apk
|
||||
libproc2 4.0.4-r2 apk
|
||||
libproxy 0.5.9-r0 apk
|
||||
libpsl 0.21.5-r3 apk
|
||||
libssl3 3.3.2-r4 apk
|
||||
libstdc++ 14.2.0-r4 apk
|
||||
libunistring 1.2-r0 apk
|
||||
linux-pam 1.6.0-r0 apk
|
||||
linux-pam 1.6.1-r1 apk
|
||||
mpdecimal 4.0.0-r0 apk
|
||||
mscorlib 6.0.3524.45918 dotnet
|
||||
musl 1.2.5-r0 apk
|
||||
musl-utils 1.2.5-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20240420-r2 apk
|
||||
netcat-openbsd 1.226-r0 apk
|
||||
musl 1.2.5-r8 apk
|
||||
musl-utils 1.2.5-r8 apk
|
||||
ncurses-terminfo-base 6.5_p20241006-r3 apk
|
||||
netcat-openbsd 1.226.1.1-r0 apk
|
||||
netstandard 6.0.3524.45918 dotnet
|
||||
nghttp2-libs 1.62.1-r0 apk
|
||||
nghttp2-libs 1.64.0-r0 apk
|
||||
oniguruma 6.9.9-r0 apk
|
||||
pcre2 10.43-r0 apk
|
||||
procps-ng 4.0.4-r0 apk
|
||||
procps-ng 4.0.4-r2 apk
|
||||
pyc 3.12.8-r1 apk
|
||||
python3 3.12.8-r1 apk
|
||||
python3-pyc 3.12.8-r1 apk
|
||||
python3-pycache-pyc0 3.12.8-r1 apk
|
||||
qbt 1.8.24285.1+c5794123bd204e629729e52e7177834c4ba3bfc2 dotnet
|
||||
qt6-qtbase 6.6.3-r1 apk
|
||||
qt6-qtbase-sqlite 6.6.3-r1 apk
|
||||
readline 8.2.10-r0 apk
|
||||
scanelf 1.3.7-r2 apk
|
||||
shadow 4.15.1-r0 apk
|
||||
skalibs 2.14.1.1-r0 apk
|
||||
sqlite-libs 3.45.3-r1 apk
|
||||
ssl_client 1.36.1-r29 apk
|
||||
tzdata 2024b-r0 apk
|
||||
utmps-libs 0.1.2.2-r1 apk
|
||||
xz-libs 5.6.2-r0 apk
|
||||
zlib 1.3.1-r1 apk
|
||||
zstd-libs 1.5.6-r0 apk
|
||||
qt6-qtbase 6.8.0-r1 apk
|
||||
qt6-qtbase-sqlite 6.8.0-r1 apk
|
||||
readline 8.2.13-r0 apk
|
||||
scanelf 1.3.8-r1 apk
|
||||
shadow 4.16.0-r1 apk
|
||||
skalibs-libs 2.14.3.0-r0 apk
|
||||
sqlite-libs 3.47.1-r0 apk
|
||||
ssl_client 1.37.0-r12 apk
|
||||
tzdata 2024b-r1 apk
|
||||
utmps-libs 0.1.2.3-r2 apk
|
||||
xz-libs 5.6.3-r0 apk
|
||||
zlib 1.3.1-r2 apk
|
||||
zstd-libs 1.5.6-r2 apk
|
||||
|
||||
@@ -34,6 +34,7 @@ opt_param_usage_include_vols: true
|
||||
opt_param_volumes:
|
||||
- {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk."}
|
||||
readonly_supported: true
|
||||
nonroot_supported: true
|
||||
# application setup block
|
||||
app_setup_block_enabled: true
|
||||
app_setup_block: |
|
||||
@@ -71,34 +72,31 @@ init_diagram: |
|
||||
init-migrations -> init-adduser
|
||||
init-os-end -> init-config
|
||||
init-config -> init-config-end
|
||||
init-crontab-config -> init-config-end
|
||||
init-qbittorrent-config -> init-config-end
|
||||
init-os-end -> init-crontab-config
|
||||
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-config -> init-qbittorrent-config
|
||||
init-custom-files -> init-services
|
||||
init-mods-end -> init-services
|
||||
init-services -> svc-cron
|
||||
svc-cron -> legacy-services
|
||||
init-services -> svc-qbittorrent
|
||||
svc-qbittorrent -> legacy-services
|
||||
}
|
||||
Base Images: {
|
||||
"baseimage-alpine:3.20"
|
||||
"baseimage-alpine:3.21"
|
||||
}
|
||||
"qbittorrent:libtorrentv1" <- Base Images
|
||||
# changelog
|
||||
changelogs:
|
||||
- {date: "20.12.24:", desc: "Rebase to Alpine 3.21."}
|
||||
- {date: "17.07.24:", desc: "Restore qbittorrent-cli as it now supports openssl 3."}
|
||||
- {date: "25.05.24:", desc: "Rebase to Alpine 3.20, remove qbittorrent-cli as it still requires openssl 1.1 which is EOL."}
|
||||
- {date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set."}
|
||||
|
||||
@@ -9,11 +9,13 @@ if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
|
||||
cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
|
||||
fi
|
||||
|
||||
# chown download directory if currently not set to abc
|
||||
if grep -qe ' /downloads ' /proc/mounts; then
|
||||
lsiown abc:abc /downloads
|
||||
fi
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
# chown download directory if currently not set to abc
|
||||
if grep -qe ' /downloads ' /proc/mounts; then
|
||||
lsiown abc:abc /downloads
|
||||
fi
|
||||
|
||||
# permissions
|
||||
lsiown -R abc:abc \
|
||||
/config
|
||||
# permissions
|
||||
lsiown -R abc:abc \
|
||||
/config
|
||||
fi
|
||||
|
||||
@@ -11,6 +11,12 @@ if [[ -z ${WEBUI_ADDRESS} ]] || [[ ${WEBUI_ADDRESS} == "*" ]]; then
|
||||
WEBUI_ADDRESS="localhost"
|
||||
fi
|
||||
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
|
||||
s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
|
||||
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
|
||||
s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
|
||||
else
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z ${WEBUI_ADDRESS} ${WEBUI_PORT}" \
|
||||
/app/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user