Compare commits
164 Commits
14.3.3.992
...
libtorrent
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23f7ef7167 | ||
|
|
00d380478f | ||
|
|
88205f46fd | ||
|
|
9ce3cbaa0d | ||
|
|
a10c1b8729 | ||
|
|
74008d71f2 | ||
|
|
f063e52eb9 | ||
|
|
134527e4a9 | ||
|
|
bc0d17401d | ||
|
|
d97b2e7d4a | ||
|
|
60df08ba86 | ||
|
|
fe250e22db | ||
|
|
3816f56755 | ||
|
|
f1eac2644f | ||
|
|
384f7ba365 | ||
|
|
c828bd5ccd | ||
|
|
dde6f08046 | ||
|
|
56ac0242f7 | ||
|
|
18d310d3c0 | ||
|
|
b0261130d1 | ||
|
|
38ce6e4eaf | ||
|
|
6483e582e8 | ||
|
|
61d98c0113 | ||
|
|
a8abbc12e2 | ||
|
|
97d4b22608 | ||
|
|
871008c306 | ||
|
|
6b27825bd7 | ||
|
|
a3ac4ce7a9 | ||
|
|
beeb9de294 | ||
|
|
06bec27898 | ||
|
|
a081d82d11 | ||
|
|
5c73db523b | ||
|
|
5318d90428 | ||
|
|
d5e03be2cf | ||
|
|
ce85d8e0ce | ||
|
|
b0576b6f80 | ||
|
|
bb25c8d32e | ||
|
|
4f68b52b04 | ||
|
|
72d7f0639c | ||
|
|
c0196b94a9 | ||
|
|
6c107b1b8e | ||
|
|
d688fd93ac | ||
|
|
cb886eabea | ||
|
|
10baef17ec | ||
|
|
2196ea8947 | ||
|
|
27358397df | ||
|
|
7b1fd614bc | ||
|
|
151bd9ef20 | ||
|
|
1de14c6540 | ||
|
|
9e2f4c203c | ||
|
|
ff4883d743 | ||
|
|
8197ab7ad0 | ||
|
|
bf8e5f1962 | ||
|
|
987952046f | ||
|
|
f0938c4f2b | ||
|
|
d17662b2d7 | ||
|
|
565e33a035 | ||
|
|
f5d7576098 | ||
|
|
01863767be | ||
|
|
1f480ed6a9 | ||
|
|
aa8bf3811b | ||
|
|
6d4d5ae9d5 | ||
|
|
ac95fb5904 | ||
|
|
0358202857 | ||
|
|
52f469a40d | ||
|
|
c067dc6e28 | ||
|
|
e9c36e0989 | ||
|
|
afe1de3e7f | ||
|
|
0ec11ff56a | ||
|
|
0ff8121521 | ||
|
|
df6b84fcee | ||
|
|
9a6fca93a4 | ||
|
|
3f1abde2d5 | ||
|
|
aa53903516 | ||
|
|
11399fc0b8 | ||
|
|
d86db02334 | ||
|
|
7c0eb4e676 | ||
|
|
f4688d02a6 | ||
|
|
e219ebb68a | ||
|
|
6b33e52b99 | ||
|
|
d8521268eb | ||
|
|
0589233f7e | ||
|
|
73869214a6 | ||
|
|
4ca216b6a5 | ||
|
|
7e84208a53 | ||
|
|
7c6e03cbee | ||
|
|
0d8a8358bc | ||
|
|
d8875f90f2 | ||
|
|
ffcce8c8ca | ||
|
|
196ab45449 | ||
|
|
ae8a2b630c | ||
|
|
bc82fbd112 | ||
|
|
6ff254fa94 | ||
|
|
161be85ba4 | ||
|
|
ab5459e94a | ||
|
|
8eedd9fc6b | ||
|
|
52f71c421d | ||
|
|
3864769098 | ||
|
|
3959ef3929 | ||
|
|
d0bd08d681 | ||
|
|
31fd25b76e | ||
|
|
f602e3f3de | ||
|
|
404387d1bf | ||
|
|
b43a38d223 | ||
|
|
7a5e9ce7a8 | ||
|
|
9a9a5ace5f | ||
|
|
0e9d1cd2a7 | ||
|
|
388c14d39f | ||
|
|
05353a4ffa | ||
|
|
f403791b9b | ||
|
|
8957575e62 | ||
|
|
51cd1d2cb9 | ||
|
|
42c5efa42d | ||
|
|
88a3d3fffb | ||
|
|
04b7ad8614 | ||
|
|
fa2c992f99 | ||
|
|
7b96dd8081 | ||
|
|
788e6ac4d1 | ||
|
|
1920d0a36b | ||
|
|
7b7b90e21c | ||
|
|
d9604dae91 | ||
|
|
f09bcb7608 | ||
|
|
ad68a8d8b5 | ||
|
|
51fa07ef4c | ||
|
|
4dcbcffd20 | ||
|
|
36f6c4727c | ||
|
|
f4599598d5 | ||
|
|
4b7c5cfa3c | ||
|
|
453fa3ab17 | ||
|
|
1b01d5533e | ||
|
|
e4c0d9a5ca | ||
|
|
f95cc6ad6b | ||
|
|
6f70db3f3c | ||
|
|
a14a44463b | ||
|
|
c6a679f65e | ||
|
|
3f43261f08 | ||
|
|
9c6a639487 | ||
|
|
83d85cedc1 | ||
|
|
d9f7f21791 | ||
|
|
2375382a28 | ||
|
|
5d811b36c6 | ||
|
|
e824d378e7 | ||
|
|
f9483a88b6 | ||
|
|
f83f3fd5fb | ||
|
|
ecbb937c39 | ||
|
|
2bbec40d33 | ||
|
|
05fbba3e20 | ||
|
|
f3de1fa5e5 | ||
|
|
ca6d61ebe6 | ||
|
|
0bf1c72566 | ||
|
|
45fcca6ea9 | ||
|
|
1dfe1b178b | ||
|
|
46b481c1f2 | ||
|
|
dd76ae8615 | ||
|
|
2862d4c64b | ||
|
|
9d15a99d0d | ||
|
|
3e1c6f411d | ||
|
|
727670c265 | ||
|
|
2b0dbd321b | ||
|
|
4aeb003f8f | ||
|
|
9e38503877 | ||
|
|
0efdf54653 | ||
|
|
ef9930aed5 | ||
|
|
f2a15340dc |
20
.editorconfig
Executable file
20
.editorconfig
Executable file
@@ -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
|
||||||
13
.github/CONTRIBUTING.md
vendored
13
.github/CONTRIBUTING.md
vendored
@@ -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.
|
* 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
|
* 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 #\<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://discord.gg/YWrKVTn)
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
## Readme
|
## Readme
|
||||||
|
|
||||||
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
|
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-qbittorrent/edit/master/readme-vars.yml).
|
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-qbittorrent/edit/libtorrentv1/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.
|
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-qbittorrent)
|
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-qbittorrent)
|
||||||
@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
|
|||||||
|
|
||||||
### Testing your changes
|
### Testing your changes
|
||||||
|
|
||||||
```
|
```bash
|
||||||
git clone https://github.com/linuxserver/docker-qbittorrent.git
|
git clone https://github.com/linuxserver/docker-qbittorrent.git
|
||||||
cd docker-qbittorrent
|
cd docker-qbittorrent
|
||||||
docker build \
|
docker build \
|
||||||
@@ -106,15 +106,16 @@ docker build \
|
|||||||
```
|
```
|
||||||
|
|
||||||
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 using `multiarch/qemu-user-static`
|
||||||
```
|
|
||||||
|
```bash
|
||||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||||
```
|
```
|
||||||
|
|
||||||
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
|
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-qbittorrent/tree/master/root), add an entry to the changelog
|
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-qbittorrent/tree/libtorrentv1/root), add an entry to the changelog
|
||||||
|
|
||||||
```yml
|
```yml
|
||||||
changelogs:
|
changelogs:
|
||||||
|
|||||||
4
.github/PULL_REQUEST_TEMPLATE.md
vendored
4
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<!--- Before submitting a pull request please check the following -->
|
<!--- Before submitting a pull request please check the following -->
|
||||||
|
|
||||||
<!--- If this is a fix for a typo in code or documentation in 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 -->
|
||||||
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
||||||
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
||||||
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|
||||||
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
|
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
|
||||||
|
|
||||||
------------------------------
|
------------------------------
|
||||||
|
|
||||||
|
|||||||
24
.github/workflows/external_trigger.yml
vendored
24
.github/workflows/external_trigger.yml
vendored
@@ -4,24 +4,24 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
external-trigger-master:
|
external-trigger-libtorrentv1:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2.3.3
|
- uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: External Trigger
|
- name: External Trigger
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/libtorrentv1'
|
||||||
run: |
|
run: |
|
||||||
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER }}" ]; then
|
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1 }}" ]; then
|
||||||
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
|
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1 is set; skipping trigger. ****"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
|
echo "**** External trigger running off of libtorrentv1 branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_LIBTORRENTV1\". ****"
|
||||||
echo "**** Retrieving external version ****"
|
echo "**** Retrieving external version ****"
|
||||||
EXT_RELEASE=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}')
|
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)')
|
||||||
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
||||||
echo "**** Can't retrieve external version, exiting ****"
|
echo "**** Can't retrieve external version, exiting ****"
|
||||||
FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"
|
FAILURE_REASON="Can't retrieve external version for qbittorrent branch libtorrentv1"
|
||||||
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-qbittorrent/actions/runs/${{ github.run_id }}"
|
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-qbittorrent/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,
|
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**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
|
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
|
||||||
@@ -32,7 +32,7 @@ jobs:
|
|||||||
echo "**** External version: ${EXT_RELEASE} ****"
|
echo "**** External version: ${EXT_RELEASE} ****"
|
||||||
echo "**** Retrieving last pushed version ****"
|
echo "**** Retrieving last pushed version ****"
|
||||||
image="linuxserver/qbittorrent"
|
image="linuxserver/qbittorrent"
|
||||||
tag="latest"
|
tag="libtorrentv1"
|
||||||
token=$(curl -sX GET \
|
token=$(curl -sX GET \
|
||||||
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
|
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqbittorrent%3Apull" \
|
||||||
| jq -r '.token')
|
| jq -r '.token')
|
||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
|
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
|
||||||
if [ -z "${IMAGE_VERSION}" ]; then
|
if [ -z "${IMAGE_VERSION}" ]; then
|
||||||
echo "**** Can't retrieve last pushed version, exiting ****"
|
echo "**** Can't retrieve last pushed version, exiting ****"
|
||||||
FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag latest"
|
FAILURE_REASON="Can't retrieve last pushed version for qbittorrent tag libtorrentv1"
|
||||||
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
|
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"}],
|
||||||
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
@@ -64,13 +64,13 @@ jobs:
|
|||||||
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
|
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
|
||||||
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
|
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
|
||||||
exit 0
|
exit 0
|
||||||
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/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 ****"
|
||||||
exit 0
|
exit 0
|
||||||
else
|
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 ****"
|
||||||
response=$(curl -iX POST \
|
response=$(curl -iX POST \
|
||||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=false \
|
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/buildWithParameters?PACKAGE_CHECK=false \
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||||
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
|
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
|
||||||
echo "**** Sleeping 10 seconds until job starts ****"
|
echo "**** Sleeping 10 seconds until job starts ****"
|
||||||
@@ -85,7 +85,7 @@ jobs:
|
|||||||
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
||||||
--data-urlencode "Submit=Submit"
|
--data-urlencode "Submit=Submit"
|
||||||
echo "**** Notifying Discord ****"
|
echo "**** Notifying Discord ****"
|
||||||
TRIGGER_REASON="A version change was detected for qbittorrent tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
|
TRIGGER_REASON="A version change was detected for qbittorrent tag libtorrentv1. 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,
|
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"}],
|
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
|
||||||
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
|
|||||||
4
.github/workflows/greetings.yml
vendored
4
.github/workflows/greetings.yml
vendored
@@ -8,6 +8,6 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/first-interaction@v1
|
- uses: actions/first-interaction@v1
|
||||||
with:
|
with:
|
||||||
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-qbittorrent/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-qbittorrent/blob/libtorrentv1/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.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-qbittorrent/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
|
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/PULL_REQUEST_TEMPLATE.md)!'
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
14
.github/workflows/package_trigger.yml
vendored
14
.github/workflows/package_trigger.yml
vendored
@@ -4,25 +4,25 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
package-trigger-master:
|
package-trigger-libtorrentv1:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2.3.3
|
- uses: actions/checkout@v2.3.3
|
||||||
|
|
||||||
- name: Package Trigger
|
- name: Package Trigger
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/libtorrentv1'
|
||||||
run: |
|
run: |
|
||||||
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER }}" ]; then
|
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_QBITTORRENT_LIBTORRENTV1 }}" ]; then
|
||||||
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER is set; skipping trigger. ****"
|
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_QBITTORRENT_LIBTORRENTV1 is set; skipping trigger. ****"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/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 ****"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_MASTER\". ****"
|
echo "**** Package trigger running off of libtorrentv1 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_QBITTORRENT_LIBTORRENTV1\". ****"
|
||||||
response=$(curl -iX POST \
|
response=$(curl -iX POST \
|
||||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/buildWithParameters?PACKAGE_CHECK=true \
|
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/buildWithParameters?PACKAGE_CHECK=true \
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||||
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
|
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
|
||||||
echo "**** Sleeping 10 seconds until job starts ****"
|
echo "**** Sleeping 10 seconds until job starts ****"
|
||||||
|
|||||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v1
|
- uses: actions/stale@v3
|
||||||
with:
|
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-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-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."
|
||||||
|
|||||||
88
Dockerfile
88
Dockerfile
@@ -1,53 +1,71 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
|
FROM ghcr.io/linuxserver/baseimage-alpine:3.16
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG QBITTORRENT_VERSION
|
ARG QBITTORRENT_VERSION
|
||||||
|
ARG QBT_VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG DEBIAN_FRONTEND="noninteractive"
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
|
|
||||||
# add repo and install qbitorrent
|
# install runtime packages and qbitorrent-cli
|
||||||
RUN \
|
RUN \
|
||||||
echo "***** add qbitorrent repositories ****" && \
|
echo "**** install build packages ****" && \
|
||||||
apt-get update && \
|
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||||
apt-get install -y \
|
make \
|
||||||
gnupg \
|
g++ \
|
||||||
python3 && \
|
gcc && \
|
||||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
echo "**** install packages ****" && \
|
||||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
apk add -U --update --no-cache \
|
||||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
p7zip \
|
||||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
python3 && \
|
||||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
echo "**** install unrar from source ****" && \
|
||||||
echo "**** install packages ****" && \
|
mkdir /tmp/unrar && \
|
||||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
curl -o \
|
||||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
/tmp/unrar.tar.gz -L \
|
||||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
"https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
|
||||||
fi && \
|
tar xf \
|
||||||
apt-get update && \
|
/tmp/unrar.tar.gz -C \
|
||||||
apt-get install -y \
|
/tmp/unrar --strip-components=1 && \
|
||||||
p7zip-full \
|
cd /tmp/unrar && \
|
||||||
qbittorrent-cli \
|
make && \
|
||||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
install -v -m755 unrar /usr/bin && \
|
||||||
unrar \
|
echo "**** install qbittorrent ****" && \
|
||||||
geoip-bin \
|
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||||
unzip && \
|
QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
|
||||||
echo "**** cleanup ****" && \
|
jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
|
||||||
apt-get clean && \
|
fi && \
|
||||||
rm -rf \
|
curl -o \
|
||||||
/tmp/* \
|
/app/qbittorrent-nox -L \
|
||||||
/var/lib/apt/lists/* \
|
"https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/x86_64-qbittorrent-nox" && \
|
||||||
/var/tmp/*
|
chmod +x /app/qbittorrent-nox && \
|
||||||
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
|
mkdir /qbt && \
|
||||||
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
|
curl -o \
|
||||||
|
/tmp/qbt.tar.gz -L \
|
||||||
|
"https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \
|
||||||
|
tar xf \
|
||||||
|
/tmp/qbt.tar.gz -C \
|
||||||
|
/qbt && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
|
apk del --purge \
|
||||||
|
build-dependencies && \
|
||||||
|
rm -rf \
|
||||||
|
/root/.cache \
|
||||||
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 6881 6881/udp 8080
|
EXPOSE 8080 6881 6881/udp
|
||||||
VOLUME /config /downloads
|
|
||||||
|
VOLUME /config
|
||||||
|
|||||||
@@ -1,53 +1,71 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
|
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG QBITTORRENT_VERSION
|
ARG QBITTORRENT_VERSION
|
||||||
|
ARG QBT_VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG DEBIAN_FRONTEND="noninteractive"
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
|
|
||||||
# add repo and install qbitorrent
|
# install runtime packages and qbitorrent-cli
|
||||||
RUN \
|
RUN \
|
||||||
echo "***** add qbitorrent repositories ****" && \
|
echo "**** install build packages ****" && \
|
||||||
apt-get update && \
|
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||||
apt-get install -y \
|
make \
|
||||||
gnupg \
|
g++ \
|
||||||
python3 && \
|
gcc && \
|
||||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
echo "**** install packages ****" && \
|
||||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
apk add -U --update --no-cache \
|
||||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
p7zip \
|
||||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
python3 && \
|
||||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
echo "**** install unrar from source ****" && \
|
||||||
echo "**** install packages ****" && \
|
mkdir /tmp/unrar && \
|
||||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
curl -o \
|
||||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
/tmp/unrar.tar.gz -L \
|
||||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
"https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
|
||||||
fi && \
|
tar xf \
|
||||||
apt-get update && \
|
/tmp/unrar.tar.gz -C \
|
||||||
apt-get install -y \
|
/tmp/unrar --strip-components=1 && \
|
||||||
p7zip-full \
|
cd /tmp/unrar && \
|
||||||
qbittorrent-cli \
|
make && \
|
||||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
install -v -m755 unrar /usr/bin && \
|
||||||
unrar \
|
echo "**** install qbittorrent ****" && \
|
||||||
geoip-bin \
|
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||||
unzip && \
|
QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
|
||||||
echo "**** cleanup ****" && \
|
jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
|
||||||
apt-get clean && \
|
fi && \
|
||||||
rm -rf \
|
curl -o \
|
||||||
/tmp/* \
|
/app/qbittorrent-nox -L \
|
||||||
/var/lib/apt/lists/* \
|
"https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/aarch64-qbittorrent-nox" && \
|
||||||
/var/tmp/*
|
chmod +x /app/qbittorrent-nox && \
|
||||||
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
|
mkdir /qbt && \
|
||||||
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
|
curl -o \
|
||||||
|
/tmp/qbt.tar.gz -L \
|
||||||
|
"https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \
|
||||||
|
tar xf \
|
||||||
|
/tmp/qbt.tar.gz -C \
|
||||||
|
/qbt && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
|
apk del --purge \
|
||||||
|
build-dependencies && \
|
||||||
|
rm -rf \
|
||||||
|
/root/.cache \
|
||||||
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 6881 6881/udp 8080
|
EXPOSE 8080 6881 6881/udp
|
||||||
VOLUME /config /downloads
|
|
||||||
|
VOLUME /config
|
||||||
|
|||||||
@@ -1,53 +1,71 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
|
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG QBITTORRENT_VERSION
|
ARG QBITTORRENT_VERSION
|
||||||
|
ARG QBT_VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
LABEL maintainer="thelamer"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG DEBIAN_FRONTEND="noninteractive"
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
|
|
||||||
# add repo and install qbitorrent
|
# install runtime packages and qbitorrent-cli
|
||||||
RUN \
|
RUN \
|
||||||
echo "***** add qbitorrent repositories ****" && \
|
echo "**** install build packages ****" && \
|
||||||
apt-get update && \
|
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||||
apt-get install -y \
|
make \
|
||||||
gnupg \
|
g++ \
|
||||||
python3 && \
|
gcc && \
|
||||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
echo "**** install packages ****" && \
|
||||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
apk add -U --update --no-cache \
|
||||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
p7zip \
|
||||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
python3 && \
|
||||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
echo "**** install unrar from source ****" && \
|
||||||
echo "**** install packages ****" && \
|
mkdir /tmp/unrar && \
|
||||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
curl -o \
|
||||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
/tmp/unrar.tar.gz -L \
|
||||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
"https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
|
||||||
fi && \
|
tar xf \
|
||||||
apt-get update && \
|
/tmp/unrar.tar.gz -C \
|
||||||
apt-get install -y \
|
/tmp/unrar --strip-components=1 && \
|
||||||
p7zip-full \
|
cd /tmp/unrar && \
|
||||||
qbittorrent-cli \
|
make && \
|
||||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
install -v -m755 unrar /usr/bin && \
|
||||||
unrar \
|
echo "**** install qbittorrent ****" && \
|
||||||
geoip-bin \
|
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||||
unzip && \
|
QBITTORRENT_VERSION=$(curl -sL "https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases" | \
|
||||||
echo "**** cleanup ****" && \
|
jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'); \
|
||||||
apt-get clean && \
|
fi && \
|
||||||
rm -rf \
|
curl -o \
|
||||||
/tmp/* \
|
/app/qbittorrent-nox -L \
|
||||||
/var/lib/apt/lists/* \
|
"https://github.com/userdocs/qbittorrent-nox-static/releases/download/${QBITTORRENT_VERSION}/armv7-qbittorrent-nox" && \
|
||||||
/var/tmp/*
|
chmod +x /app/qbittorrent-nox && \
|
||||||
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
|
mkdir /qbt && \
|
||||||
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
|
curl -o \
|
||||||
|
/tmp/qbt.tar.gz -L \
|
||||||
|
"https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm-${QBT_VERSION:1}.tar.gz" && \
|
||||||
|
tar xf \
|
||||||
|
/tmp/qbt.tar.gz -C \
|
||||||
|
/qbt && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
|
apk del --purge \
|
||||||
|
build-dependencies && \
|
||||||
|
rm -rf \
|
||||||
|
/root/.cache \
|
||||||
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 6881 6881/udp 8080
|
EXPOSE 8080 6881 6881/udp
|
||||||
VOLUME /config /downloads
|
|
||||||
|
VOLUME /config
|
||||||
|
|||||||
330
Jenkinsfile
vendored
330
Jenkinsfile
vendored
@@ -16,6 +16,7 @@ pipeline {
|
|||||||
GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
|
GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
|
||||||
GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
|
GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
|
||||||
GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
|
GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
|
||||||
|
SCARF_TOKEN=credentials('scarf_api_key')
|
||||||
CONTAINER_NAME = 'qbittorrent'
|
CONTAINER_NAME = 'qbittorrent'
|
||||||
BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
|
BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
|
||||||
LS_USER = 'linuxserver'
|
LS_USER = 'linuxserver'
|
||||||
@@ -23,7 +24,8 @@ pipeline {
|
|||||||
DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
|
DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
|
||||||
DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
|
DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
|
||||||
PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
|
PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
|
||||||
DIST_IMAGE = 'ubuntu'
|
DIST_IMAGE = 'alpine'
|
||||||
|
DIST_TAG = 'edge'
|
||||||
MULTIARCH='true'
|
MULTIARCH='true'
|
||||||
CI='true'
|
CI='true'
|
||||||
CI_WEB='true'
|
CI_WEB='true'
|
||||||
@@ -41,7 +43,7 @@ pipeline {
|
|||||||
script{
|
script{
|
||||||
env.EXIT_STATUS = ''
|
env.EXIT_STATUS = ''
|
||||||
env.LS_RELEASE = sh(
|
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 ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':libtorrentv1 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||||
returnStdout: true).trim()
|
returnStdout: true).trim()
|
||||||
env.LS_RELEASE_NOTES = sh(
|
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' ''',
|
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' ''',
|
||||||
@@ -55,7 +57,7 @@ pipeline {
|
|||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
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.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||||
env.PULL_REQUEST = env.CHANGE_ID
|
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 ./.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 .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'
|
||||||
}
|
}
|
||||||
script{
|
script{
|
||||||
env.LS_RELEASE_NUMBER = sh(
|
env.LS_RELEASE_NUMBER = sh(
|
||||||
@@ -103,7 +105,7 @@ pipeline {
|
|||||||
steps{
|
steps{
|
||||||
script{
|
script{
|
||||||
env.EXT_RELEASE = sh(
|
env.EXT_RELEASE = sh(
|
||||||
script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
|
script: ''' curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)' ''',
|
||||||
returnStdout: true).trim()
|
returnStdout: true).trim()
|
||||||
env.RELEASE_LINK = 'custom_command'
|
env.RELEASE_LINK = 'custom_command'
|
||||||
}
|
}
|
||||||
@@ -116,13 +118,37 @@ pipeline {
|
|||||||
env.EXT_RELEASE_CLEAN = sh(
|
env.EXT_RELEASE_CLEAN = sh(
|
||||||
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
|
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
|
||||||
returnStdout: true).trim()
|
returnStdout: true).trim()
|
||||||
|
|
||||||
|
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')}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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")
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If this is a master build use live docker endpoints
|
// If this is a libtorrentv1 build use live docker endpoints
|
||||||
stage("Set ENV live build"){
|
stage("Set ENV live build"){
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@@ -130,21 +156,22 @@ pipeline {
|
|||||||
env.IMAGE = env.DOCKERHUB_IMAGE
|
env.IMAGE = env.DOCKERHUB_IMAGE
|
||||||
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + 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
|
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') {
|
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-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
env.CI_TAGS = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
}
|
}
|
||||||
env.VERSION_TAG = 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.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If this is a dev build use dev docker endpoints
|
// If this is a dev build use dev docker endpoints
|
||||||
stage("Set ENV dev build"){
|
stage("Set ENV dev build"){
|
||||||
when {
|
when {
|
||||||
not {branch "master"}
|
not {branch "libtorrentv1"}
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
@@ -152,14 +179,15 @@ pipeline {
|
|||||||
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
|
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
|
||||||
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/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
|
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') {
|
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-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
env.CI_TAGS = 'libtorrentv1-' + 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.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.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||||
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
|
||||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
|
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -174,14 +202,15 @@ pipeline {
|
|||||||
env.IMAGE = env.PR_DOCKERHUB_IMAGE
|
env.IMAGE = env.PR_DOCKERHUB_IMAGE
|
||||||
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/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
|
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') {
|
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-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||||
} else {
|
} else {
|
||||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
env.CI_TAGS = 'libtorrentv1-' + 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.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.META_TAG = 'libtorrentv1-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||||
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
env.EXT_RELEASE_TAG = 'libtorrentv1-version-' + env.EXT_RELEASE_CLEAN
|
||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + 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/'
|
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
|
||||||
}
|
}
|
||||||
@@ -219,7 +248,7 @@ pipeline {
|
|||||||
// Use helper containers to render templated files
|
// Use helper containers to render templated files
|
||||||
stage('Update-Templates') {
|
stage('Update-Templates') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
expression {
|
expression {
|
||||||
env.CONTAINER_NAME != null
|
env.CONTAINER_NAME != null
|
||||||
@@ -230,13 +259,13 @@ pipeline {
|
|||||||
set -e
|
set -e
|
||||||
TEMPDIR=$(mktemp -d)
|
TEMPDIR=$(mktemp -d)
|
||||||
docker pull ghcr.io/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
|
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=libtorrentv1 -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
|
||||||
# Stage 1 - Jenkinsfile update
|
# Stage 1 - Jenkinsfile update
|
||||||
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
|
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
|
||||||
mkdir -p ${TEMPDIR}/repo
|
mkdir -p ${TEMPDIR}/repo
|
||||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||||
git checkout -f master
|
git checkout -f libtorrentv1
|
||||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
|
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
|
||||||
git add Jenkinsfile
|
git add Jenkinsfile
|
||||||
git commit -m 'Bot Updating Templated Files'
|
git commit -m 'Bot Updating Templated Files'
|
||||||
@@ -259,8 +288,7 @@ pipeline {
|
|||||||
mkdir -p ${TEMPDIR}/repo
|
mkdir -p ${TEMPDIR}/repo
|
||||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||||
git checkout -f master
|
git checkout -f libtorrentv1
|
||||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
|
||||||
for i in ${TEMPLATES_TO_DELETE}; do
|
for i in ${TEMPLATES_TO_DELETE}; do
|
||||||
git rm "${i}"
|
git rm "${i}"
|
||||||
done
|
done
|
||||||
@@ -281,7 +309,7 @@ pipeline {
|
|||||||
mkdir -p ${TEMPDIR}/repo
|
mkdir -p ${TEMPDIR}/repo
|
||||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||||
git checkout -f master
|
git checkout -f libtorrentv1
|
||||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
||||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
||||||
@@ -307,22 +335,26 @@ pipeline {
|
|||||||
git commit -m 'Bot Updating Documentation'
|
git commit -m 'Bot Updating Documentation'
|
||||||
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
|
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
|
||||||
fi
|
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/docker-templates.git ${TEMPDIR}/unraid/docker-templates
|
||||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/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
|
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}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
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
|
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
|
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
|
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, 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
|
else
|
||||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${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 add unraid/${CONTAINER_NAME}.xml
|
||||||
git commit -m 'Bot Updating Unraid Template'
|
git commit -m 'Bot Updating Unraid Template'
|
||||||
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
|
|
||||||
fi
|
fi
|
||||||
|
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
|
||||||
fi
|
fi
|
||||||
rm -Rf ${TEMPDIR}'''
|
rm -Rf ${TEMPDIR}'''
|
||||||
script{
|
script{
|
||||||
@@ -335,7 +367,7 @@ pipeline {
|
|||||||
// Exit the build if the Templated files were just updated
|
// Exit the build if the Templated files were just updated
|
||||||
stage('Template-exit') {
|
stage('Template-exit') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
environment name: 'FILES_UPDATED', value: 'true'
|
environment name: 'FILES_UPDATED', value: 'true'
|
||||||
expression {
|
expression {
|
||||||
@@ -368,33 +400,94 @@ pipeline {
|
|||||||
"visibility":"public"}' '''
|
"visibility":"public"}' '''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* #######################
|
||||||
|
Scarf.sh package registry
|
||||||
|
####################### */
|
||||||
|
// Add package to Scarf.sh and set permissions
|
||||||
|
stage("Scarf.sh package registry"){
|
||||||
|
when {
|
||||||
|
branch "libtorrentv1"
|
||||||
|
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/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .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/qbittorrent",\
|
||||||
|
"shortDescription":"example description",\
|
||||||
|
"libraryType":"docker",\
|
||||||
|
"website":"https://github.com/linuxserver/docker-qbittorrent",\
|
||||||
|
"backendUrl":"https://ghcr.io/linuxserver/qbittorrent",\
|
||||||
|
"publicUrl":"https://lscr.io/linuxserver/qbittorrent"}' || :
|
||||||
|
else
|
||||||
|
echo "Package already exists on Scarf.sh"
|
||||||
|
fi
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
/* ###############
|
/* ###############
|
||||||
Build Container
|
Build Container
|
||||||
############### */
|
############### */
|
||||||
// Build Docker container for push to LS Repo
|
// Build Docker container for push to LS Repo
|
||||||
stage('Build-Single') {
|
stage('Build-Single') {
|
||||||
when {
|
when {
|
||||||
environment name: 'MULTIARCH', value: 'false'
|
expression {
|
||||||
|
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
|
||||||
|
}
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
echo "Running on node: ${NODE_NAME}"
|
echo "Running on node: ${NODE_NAME}"
|
||||||
sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
|
sh "docker build \
|
||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||||
|
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||||
|
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
|
||||||
|
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
|
||||||
|
--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=Qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
|
||||||
|
--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
|
// Build MultiArch Docker containers for push to LS Repo
|
||||||
stage('Build-Multi') {
|
stage('Build-Multi') {
|
||||||
when {
|
when {
|
||||||
environment name: 'MULTIARCH', value: 'true'
|
allOf {
|
||||||
|
environment name: 'MULTIARCH', value: 'true'
|
||||||
|
expression { params.PACKAGE_CHECK == 'false' }
|
||||||
|
}
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('Build X86') {
|
stage('Build X86') {
|
||||||
steps {
|
steps {
|
||||||
echo "Running on node: ${NODE_NAME}"
|
echo "Running on node: ${NODE_NAME}"
|
||||||
sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
|
sh "docker build \
|
||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||||
|
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||||
|
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
|
||||||
|
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
|
||||||
|
--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=Qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
|
||||||
|
--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') {
|
stage('Build ARMHF') {
|
||||||
@@ -407,8 +500,21 @@ pipeline {
|
|||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
|
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} \
|
sh "docker build \
|
||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||||
|
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||||
|
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
|
||||||
|
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
|
||||||
|
--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=Qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
|
||||||
|
--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}"
|
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||||
retry(5) {
|
retry(5) {
|
||||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||||
@@ -428,8 +534,21 @@ pipeline {
|
|||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
|
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} \
|
sh "docker build \
|
||||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||||
|
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||||
|
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-qbittorrent/packages\" \
|
||||||
|
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-qbittorrent\" \
|
||||||
|
--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=Qbittorrent\" \
|
||||||
|
--label \"org.opencontainers.image.description=The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.\" \
|
||||||
|
--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}"
|
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||||
retry(5) {
|
retry(5) {
|
||||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||||
@@ -444,7 +563,7 @@ pipeline {
|
|||||||
// Take the image we just built and dump package versions for comparison
|
// Take the image we just built and dump package versions for comparison
|
||||||
stage('Update-packages') {
|
stage('Update-packages') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
}
|
}
|
||||||
@@ -452,7 +571,7 @@ pipeline {
|
|||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
set -e
|
set -e
|
||||||
TEMPDIR=$(mktemp -d)
|
TEMPDIR=$(mktemp -d)
|
||||||
if [ "${MULTIARCH}" == "true" ]; then
|
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||||
else
|
else
|
||||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||||
@@ -467,12 +586,21 @@ pipeline {
|
|||||||
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /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 && \
|
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||||
chmod 777 /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
|
fi
|
||||||
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
|
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"
|
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
|
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
|
||||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
|
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
|
||||||
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
|
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f libtorrentv1
|
||||||
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
|
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
|
||||||
cd ${TEMPDIR}/${LS_REPO}/
|
cd ${TEMPDIR}/${LS_REPO}/
|
||||||
wait
|
wait
|
||||||
@@ -496,7 +624,7 @@ pipeline {
|
|||||||
// Exit the build if the package file was just updated
|
// Exit the build if the package file was just updated
|
||||||
stage('PACKAGE-exit') {
|
stage('PACKAGE-exit') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
environment name: 'PACKAGE_UPDATED', value: 'true'
|
environment name: 'PACKAGE_UPDATED', value: 'true'
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
@@ -504,7 +632,7 @@ pipeline {
|
|||||||
steps {
|
steps {
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo "Packages were updated. Cleaning up the image and exiting."
|
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}
|
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||||
else
|
else
|
||||||
docker rmi ${IMAGE}:${META_TAG}
|
docker rmi ${IMAGE}:${META_TAG}
|
||||||
@@ -517,7 +645,7 @@ pipeline {
|
|||||||
// Exit the build if this is just a package check and there are no changes to push
|
// Exit the build if this is just a package check and there are no changes to push
|
||||||
stage('PACKAGECHECK-exit') {
|
stage('PACKAGECHECK-exit') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
environment name: 'CHANGE_ID', value: ''
|
environment name: 'CHANGE_ID', value: ''
|
||||||
environment name: 'PACKAGE_UPDATED', value: 'false'
|
environment name: 'PACKAGE_UPDATED', value: 'false'
|
||||||
environment name: 'EXIT_STATUS', value: ''
|
environment name: 'EXIT_STATUS', value: ''
|
||||||
@@ -528,7 +656,7 @@ pipeline {
|
|||||||
steps {
|
steps {
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo "There are no package updates. Cleaning up the image and exiting."
|
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}
|
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||||
else
|
else
|
||||||
docker rmi ${IMAGE}:${META_TAG}
|
docker rmi ${IMAGE}:${META_TAG}
|
||||||
@@ -583,7 +711,7 @@ pipeline {
|
|||||||
-e DO_REGION="ams3" \
|
-e DO_REGION="ams3" \
|
||||||
-e DO_BUCKET="lsio-ci" \
|
-e DO_BUCKET="lsio-ci" \
|
||||||
-t ghcr.io/linuxserver/ci:latest \
|
-t ghcr.io/linuxserver/ci:latest \
|
||||||
python /ci/ci.py'''
|
python3 test_build.py'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -603,6 +731,12 @@ pipeline {
|
|||||||
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
||||||
usernameVariable: 'DOCKERUSER',
|
usernameVariable: 'DOCKERUSER',
|
||||||
passwordVariable: 'DOCKERPASS'
|
passwordVariable: 'DOCKERPASS'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
$class: 'UsernamePasswordMultiBinding',
|
||||||
|
credentialsId: 'Quay.io-Robot',
|
||||||
|
usernameVariable: 'QUAYUSER',
|
||||||
|
passwordVariable: 'QUAYPASS'
|
||||||
]
|
]
|
||||||
]) {
|
]) {
|
||||||
retry(5) {
|
retry(5) {
|
||||||
@@ -611,22 +745,32 @@ pipeline {
|
|||||||
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
||||||
echo $GITHUB_TOKEN | docker login ghcr.io -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
|
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 ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
|
||||||
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
|
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:libtorrentv1
|
||||||
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
|
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
|
||||||
docker push ${PUSHIMAGE}:latest
|
if [ -n "${SEMVER}" ]; then
|
||||||
|
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
|
||||||
|
fi
|
||||||
|
docker push ${PUSHIMAGE}:libtorrentv1
|
||||||
docker push ${PUSHIMAGE}:${META_TAG}
|
docker push ${PUSHIMAGE}:${META_TAG}
|
||||||
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
|
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
|
||||||
|
if [ -n "${SEMVER}" ]; then
|
||||||
|
docker push ${PUSHIMAGE}:${SEMVER}
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||||
docker rmi \
|
docker rmi \
|
||||||
${DELETEIMAGE}:${META_TAG} \
|
${DELETEIMAGE}:${META_TAG} \
|
||||||
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
|
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
|
||||||
${DELETEIMAGE}:latest || :
|
${DELETEIMAGE}:libtorrentv1 || :
|
||||||
|
if [ -n "${SEMVER}" ]; then
|
||||||
|
docker rmi ${DELETEIMAGE}:${SEMVER} || :
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
@@ -645,6 +789,12 @@ pipeline {
|
|||||||
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
|
||||||
usernameVariable: 'DOCKERUSER',
|
usernameVariable: 'DOCKERUSER',
|
||||||
passwordVariable: 'DOCKERPASS'
|
passwordVariable: 'DOCKERPASS'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
$class: 'UsernamePasswordMultiBinding',
|
||||||
|
credentialsId: 'Quay.io-Robot',
|
||||||
|
usernameVariable: 'QUAYUSER',
|
||||||
|
passwordVariable: 'QUAYPASS'
|
||||||
]
|
]
|
||||||
]) {
|
]) {
|
||||||
retry(5) {
|
retry(5) {
|
||||||
@@ -653,35 +803,46 @@ pipeline {
|
|||||||
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
|
||||||
echo $GITHUB_TOKEN | docker login ghcr.io -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
|
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
|
if [ "${CI}" == "false" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
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 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: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}
|
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||||
fi
|
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}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
|
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-libtorrentv1
|
||||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
|
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-libtorrentv1
|
||||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
|
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-libtorrentv1
|
||||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
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}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
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-${META_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:amd64-latest
|
docker push ${MANIFESTIMAGE}:amd64-libtorrentv1
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-latest
|
docker push ${MANIFESTIMAGE}:arm32v7-libtorrentv1
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-latest
|
docker push ${MANIFESTIMAGE}:arm64v8-libtorrentv1
|
||||||
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||||
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
|
if [ -n "${SEMVER}" ]; then
|
||||||
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
|
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
|
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
||||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
|
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||||
|
fi
|
||||||
|
docker manifest push --purge ${MANIFESTIMAGE}:libtorrentv1 || :
|
||||||
|
docker manifest create ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:amd64-libtorrentv1 ${MANIFESTIMAGE}:arm32v7-libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1
|
||||||
|
docker manifest annotate ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:arm32v7-libtorrentv1 --os linux --arch arm
|
||||||
|
docker manifest annotate ${MANIFESTIMAGE}:libtorrentv1 ${MANIFESTIMAGE}:arm64v8-libtorrentv1 --os linux --arch arm64 --variant v8
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
|
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 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}:arm32v7-${META_TAG} --os linux --arch arm
|
||||||
@@ -690,24 +851,39 @@ 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 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}: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 annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:latest
|
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}:libtorrentv1
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
||||||
|
if [ -n "${SEMVER}" ]; then
|
||||||
|
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||||
docker rmi \
|
docker rmi \
|
||||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
${DELETEIMAGE}:amd64-${META_TAG} \
|
||||||
${DELETEIMAGE}:amd64-latest \
|
${DELETEIMAGE}:amd64-libtorrentv1 \
|
||||||
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
|
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
|
||||||
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
||||||
${DELETEIMAGE}:arm32v7-latest \
|
${DELETEIMAGE}:arm32v7-libtorrentv1 \
|
||||||
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
|
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
|
||||||
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
||||||
${DELETEIMAGE}:arm64v8-latest \
|
${DELETEIMAGE}:arm64v8-libtorrentv1 \
|
||||||
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
|
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
|
||||||
|
if [ -n "${SEMVER}" ]; then
|
||||||
|
docker rmi \
|
||||||
|
${DELETEIMAGE}:amd64-${SEMVER} \
|
||||||
|
${DELETEIMAGE}:arm32v7-${SEMVER} \
|
||||||
|
${DELETEIMAGE}:arm64v8-${SEMVER} || :
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
docker rmi \
|
docker rmi \
|
||||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
||||||
@@ -719,7 +895,7 @@ pipeline {
|
|||||||
// If this is a public release tag it in the LS Github
|
// If this is a public release tag it in the LS Github
|
||||||
stage('Github-Tag-Push-Release') {
|
stage('Github-Tag-Push-Release') {
|
||||||
when {
|
when {
|
||||||
branch "master"
|
branch "libtorrentv1"
|
||||||
expression {
|
expression {
|
||||||
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||||
}
|
}
|
||||||
@@ -731,17 +907,17 @@ pipeline {
|
|||||||
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
|
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
|
||||||
-d '{"tag":"'${META_TAG}'",\
|
-d '{"tag":"'${META_TAG}'",\
|
||||||
"object": "'${COMMIT_SHA}'",\
|
"object": "'${COMMIT_SHA}'",\
|
||||||
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
|
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to libtorrentv1",\
|
||||||
"type": "commit",\
|
"type": "commit",\
|
||||||
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
|
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
|
||||||
echo "Pushing New release for Tag"
|
echo "Pushing New release for Tag"
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
|
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
|
||||||
echo '{"tag_name":"'${META_TAG}'",\
|
echo '{"tag_name":"'${META_TAG}'",\
|
||||||
"target_commitish": "master",\
|
"target_commitish": "libtorrentv1",\
|
||||||
"name": "'${META_TAG}'",\
|
"name": "'${META_TAG}'",\
|
||||||
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
|
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
|
||||||
printf '","draft": false,"prerelease": false}' >> releasebody.json
|
printf '","draft": false,"prerelease": true}' >> releasebody.json
|
||||||
paste -d'\\0' start releasebody.json > releasebody.json.done
|
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'''
|
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
|
||||||
}
|
}
|
||||||
@@ -765,7 +941,7 @@ pipeline {
|
|||||||
set -e
|
set -e
|
||||||
TEMPDIR=$(mktemp -d)
|
TEMPDIR=$(mktemp -d)
|
||||||
docker pull ghcr.io/linuxserver/jenkins-builder:latest
|
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 pull ghcr.io/linuxserver/readme-sync
|
||||||
docker run --rm=true \
|
docker run --rm=true \
|
||||||
-e DOCKERHUB_USERNAME=$DOCKERUSER \
|
-e DOCKERHUB_USERNAME=$DOCKERUSER \
|
||||||
|
|||||||
152
README.md
152
README.md
@@ -1,5 +1,5 @@
|
|||||||
<!-- DO NOT EDIT THIS FILE MANUALLY -->
|
<!-- DO NOT EDIT THIS FILE MANUALLY -->
|
||||||
<!-- Please read the CONTRIBUTING.md -->
|
<!-- Please read the https://github.com/linuxserver/docker-qbittorrent/blob/libtorrentv1/.github/CONTRIBUTING.md -->
|
||||||
|
|
||||||
[](https://linuxserver.io)
|
[](https://linuxserver.io)
|
||||||
|
|
||||||
@@ -12,13 +12,14 @@
|
|||||||
|
|
||||||
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
|
* regular and timely application updates
|
||||||
* easy user mappings (PGID, PUID)
|
* easy user mappings (PGID, PUID)
|
||||||
* custom base image with s6 overlay
|
* 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
|
* 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 security updates
|
||||||
|
|
||||||
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://discord.gg/YWrKVTn) - 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.
|
||||||
@@ -28,14 +29,15 @@ Find us at:
|
|||||||
|
|
||||||
# [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
|
# [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
|
||||||
|
|
||||||
|
[](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fqbittorrent)
|
||||||
[](https://github.com/linuxserver/docker-qbittorrent)
|
[](https://github.com/linuxserver/docker-qbittorrent)
|
||||||
[](https://github.com/linuxserver/docker-qbittorrent/releases)
|
[](https://github.com/linuxserver/docker-qbittorrent/releases)
|
||||||
[](https://github.com/linuxserver/docker-qbittorrent/packages)
|
[](https://github.com/linuxserver/docker-qbittorrent/packages)
|
||||||
[](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
|
[](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
|
||||||
[](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
|
[](https://quay.io/repository/linuxserver.io/qbittorrent)
|
||||||
[](https://hub.docker.com/r/linuxserver/qbittorrent)
|
[](https://hub.docker.com/r/linuxserver/qbittorrent)
|
||||||
[](https://hub.docker.com/r/linuxserver/qbittorrent)
|
[](https://hub.docker.com/r/linuxserver/qbittorrent)
|
||||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/master/)
|
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-qbittorrent/job/libtorrentv1/)
|
||||||
[](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/latest/index.html)
|
[](https://ci-tests.linuxserver.io/linuxserver/qbittorrent/latest/index.html)
|
||||||
|
|
||||||
The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
|
The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
|
||||||
@@ -44,41 +46,65 @@ The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-
|
|||||||
|
|
||||||
## Supported Architectures
|
## 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 `ghcr.io/linuxserver/qbittorrent` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
Simply pulling `lscr.io/linuxserver/qbittorrent:libtorrentv1` 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:
|
The architectures supported by this image are:
|
||||||
|
|
||||||
| Architecture | Tag |
|
| Architecture | Available | Tag |
|
||||||
| :----: | --- |
|
| :----: | :----: | ---- |
|
||||||
| x86-64 | amd64-latest |
|
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||||
| arm64 | arm64v8-latest |
|
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||||
| armhf | arm32v7-latest |
|
| armhf| ✅ | arm32v7-\<version tag\> |
|
||||||
|
|
||||||
## Version Tags
|
## 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 |
|
| Tag | Available | Description |
|
||||||
| :----: | --- |
|
| :----: | :----: |--- |
|
||||||
| latest | Stable qbittorrent releases |
|
| latest | ✅ | Stable qbittorrent releases |
|
||||||
| unstable | Unstable qbittorrent releases |
|
| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
|
||||||
|
|
||||||
|
## Application Setup
|
||||||
|
|
||||||
|
The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.
|
||||||
|
|
||||||
|
Change username/password via the webui in the webui section of settings.
|
||||||
|
|
||||||
|
### WEBUI_PORT variable
|
||||||
|
|
||||||
|
Due to issues with CSRF and port mapping, should you require to alter the port for the webui 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
|
||||||
|
|
||||||
|
This should alleviate the "white screen" issue.
|
||||||
|
|
||||||
|
If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
|
||||||
|
|
||||||
|
edit or add the following lines
|
||||||
|
|
||||||
|
```text
|
||||||
|
WebUI\Address=*
|
||||||
|
|
||||||
|
WebUI\ServerDomains=*
|
||||||
|
```
|
||||||
|
|
||||||
|
If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Here are some example snippets to help you get started creating a container.
|
Here are some example snippets to help you get started creating a container.
|
||||||
|
|
||||||
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
|
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
|
||||||
|
|
||||||
Compatible with docker-compose v2 schemas.
|
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
---
|
---
|
||||||
version: "2.1"
|
version: "2.1"
|
||||||
services:
|
services:
|
||||||
qbittorrent:
|
qbittorrent:
|
||||||
image: ghcr.io/linuxserver/qbittorrent
|
image: lscr.io/linuxserver/qbittorrent:libtorrentv1
|
||||||
container_name: qbittorrent
|
container_name: qbittorrent
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
@@ -89,40 +115,39 @@ services:
|
|||||||
- /path/to/appdata/config:/config
|
- /path/to/appdata/config:/config
|
||||||
- /path/to/downloads:/downloads
|
- /path/to/downloads:/downloads
|
||||||
ports:
|
ports:
|
||||||
|
- 8080:8080
|
||||||
- 6881:6881
|
- 6881:6881
|
||||||
- 6881:6881/udp
|
- 6881:6881/udp
|
||||||
- 8080:8080
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
```
|
```
|
||||||
|
|
||||||
### docker cli
|
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
|
||||||
|
|
||||||
```
|
```bash
|
||||||
docker run -d \
|
docker run -d \
|
||||||
--name=qbittorrent \
|
--name=qbittorrent \
|
||||||
-e PUID=1000 \
|
-e PUID=1000 \
|
||||||
-e PGID=1000 \
|
-e PGID=1000 \
|
||||||
-e TZ=Europe/London \
|
-e TZ=Europe/London \
|
||||||
-e WEBUI_PORT=8080 \
|
-e WEBUI_PORT=8080 \
|
||||||
|
-p 8080:8080 \
|
||||||
-p 6881:6881 \
|
-p 6881:6881 \
|
||||||
-p 6881:6881/udp \
|
-p 6881:6881/udp \
|
||||||
-p 8080:8080 \
|
|
||||||
-v /path/to/appdata/config:/config \
|
-v /path/to/appdata/config:/config \
|
||||||
-v /path/to/downloads:/downloads \
|
-v /path/to/downloads:/downloads \
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
ghcr.io/linuxserver/qbittorrent
|
lscr.io/linuxserver/qbittorrent:libtorrentv1
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
## Parameters
|
## 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.
|
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.
|
||||||
|
|
||||||
| Parameter | Function |
|
| Parameter | Function |
|
||||||
| :----: | --- |
|
| :----: | --- |
|
||||||
|
| `-p 8080` | WebUI |
|
||||||
| `-p 6881` | tcp connection port |
|
| `-p 6881` | tcp connection port |
|
||||||
| `-p 6881/udp` | udp connection port |
|
| `-p 6881/udp` | udp connection port |
|
||||||
| `-p 8080` | http gui |
|
|
||||||
| `-e PUID=1000` | for UserID - see below for explanation |
|
| `-e PUID=1000` | for UserID - see below for explanation |
|
||||||
| `-e PGID=1000` | for GroupID - 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=Europe/London` | Specify a timezone to use EG Europe/London |
|
||||||
@@ -136,7 +161,7 @@ You can set any environment variable from a file by using a special prepend `FIL
|
|||||||
|
|
||||||
As an example:
|
As an example:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
-e FILE__PASSWORD=/run/secrets/mysecretpassword
|
-e FILE__PASSWORD=/run/secrets/mysecretpassword
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -155,45 +180,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:
|
In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
$ id username
|
$ id username
|
||||||
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
|
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Application Setup
|
|
||||||
|
|
||||||
The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.
|
|
||||||
|
|
||||||
Change username/password via the webui in the webui section of settings.
|
|
||||||
|
|
||||||
|
|
||||||
### WEBUI_PORT variable
|
|
||||||
|
|
||||||
Due to issues with CSRF and port mapping, should you require to alter the port for the webui 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
|
|
||||||
|
|
||||||
This should alleviate the "white screen" issue.
|
|
||||||
|
|
||||||
If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
|
|
||||||
|
|
||||||
edit or add the following lines
|
|
||||||
|
|
||||||
```
|
|
||||||
WebUI\Address=*
|
|
||||||
|
|
||||||
WebUI\ServerDomains=*
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
## Docker Mods
|
## Docker Mods
|
||||||
|
|
||||||
[](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.") [](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
|
[](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.") [](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.
|
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
|
## Support Info
|
||||||
|
|
||||||
* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
|
* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
|
||||||
@@ -201,7 +198,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
|
|||||||
* container version number
|
* container version number
|
||||||
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
|
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
|
||||||
* image version number
|
* image version number
|
||||||
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/qbittorrent`
|
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:libtorrentv1`
|
||||||
|
|
||||||
## Updating Info
|
## Updating Info
|
||||||
|
|
||||||
@@ -210,6 +207,7 @@ Most of our images are static, versioned, and require an image update and contai
|
|||||||
Below are the instructions for updating containers:
|
Below are the instructions for updating containers:
|
||||||
|
|
||||||
### Via Docker Compose
|
### Via Docker Compose
|
||||||
|
|
||||||
* Update all images: `docker-compose pull`
|
* Update all images: `docker-compose pull`
|
||||||
* or update a single image: `docker-compose pull qbittorrent`
|
* or update a single image: `docker-compose pull qbittorrent`
|
||||||
* Let compose update all containers as necessary: `docker-compose up -d`
|
* Let compose update all containers as necessary: `docker-compose up -d`
|
||||||
@@ -217,41 +215,48 @@ Below are the instructions for updating containers:
|
|||||||
* You can also remove the old dangling images: `docker image prune`
|
* You can also remove the old dangling images: `docker image prune`
|
||||||
|
|
||||||
### Via Docker Run
|
### Via Docker Run
|
||||||
* Update the image: `docker pull ghcr.io/linuxserver/qbittorrent`
|
|
||||||
|
* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:libtorrentv1`
|
||||||
* Stop the running container: `docker stop qbittorrent`
|
* Stop the running container: `docker stop qbittorrent`
|
||||||
* Delete the container: `docker rm qbittorrent`
|
* Delete the container: `docker rm qbittorrent`
|
||||||
* 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)
|
* 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: `docker image prune`
|
||||||
|
|
||||||
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
|
### 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:
|
* Pull the latest image at its tag and replace it with the same env variables in one run:
|
||||||
```
|
|
||||||
|
```bash
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
containrrr/watchtower \
|
containrrr/watchtower \
|
||||||
--run-once qbittorrent
|
--run-once qbittorrent
|
||||||
```
|
```
|
||||||
|
|
||||||
* You can also remove the old dangling images: `docker image prune`
|
* 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).
|
**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)
|
### 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.
|
* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
|
||||||
|
|
||||||
## Building locally
|
## 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:
|
||||||
```
|
|
||||||
|
```bash
|
||||||
git clone https://github.com/linuxserver/docker-qbittorrent.git
|
git clone https://github.com/linuxserver/docker-qbittorrent.git
|
||||||
cd docker-qbittorrent
|
cd docker-qbittorrent
|
||||||
docker build \
|
docker build \
|
||||||
--no-cache \
|
--no-cache \
|
||||||
--pull \
|
--pull \
|
||||||
-t ghcr.io/linuxserver/qbittorrent:latest .
|
-t lscr.io/linuxserver/qbittorrent:libtorrentv1 .
|
||||||
```
|
```
|
||||||
|
|
||||||
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 using `multiarch/qemu-user-static`
|
||||||
```
|
|
||||||
|
```bash
|
||||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -259,6 +264,17 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **30.10.22:** - Add libtorrent v1 branch.
|
||||||
|
* **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
|
||||||
|
* **12.08.22:** - Bump unrar to 6.1.7.
|
||||||
|
* **16.06.22:** - Rebase to Alpine 3.16 from edge.
|
||||||
|
* **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
|
||||||
|
* **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
|
||||||
|
* **01.03.22:** - Add python for search plugin support.
|
||||||
|
* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
|
||||||
|
* **19.02.22:** - Add jq to build-stage
|
||||||
|
* **07.01.22:** - Rebase to Alpine, build from source.
|
||||||
|
* **06.01.22:** - Deprecate unstable branch.
|
||||||
* **10.02.21:** - Rebase to focal.
|
* **10.02.21:** - Rebase to focal.
|
||||||
* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
|
* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
|
||||||
* **12.11.20:** - Stop creating /config/data directory on startup
|
* **12.11.20:** - Stop creating /config/data directory on startup
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
# jenkins variables
|
# jenkins variables
|
||||||
project_name: docker-qbittorrent
|
project_name: docker-qbittorrent
|
||||||
external_type: na
|
external_type: na
|
||||||
custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
|
custom_version_command: "curl -sL 'https://api.github.com/repos/userdocs/qbittorrent-nox-static/releases' | jq -r 'first(.[] | select(.prerelease == true) | .tag_name)'"
|
||||||
release_type: stable
|
release_type: prerelease
|
||||||
release_tag: latest
|
release_tag: libtorrentv1
|
||||||
ls_branch: master
|
ls_branch: libtorrentv1
|
||||||
repo_vars:
|
repo_vars:
|
||||||
- CONTAINER_NAME = 'qbittorrent'
|
- CONTAINER_NAME = 'qbittorrent'
|
||||||
- BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
|
- BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
|
||||||
@@ -15,7 +15,8 @@ repo_vars:
|
|||||||
- DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
|
- DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
|
||||||
- DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
|
- DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
|
||||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
|
- PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
|
||||||
- DIST_IMAGE = 'ubuntu'
|
- DIST_IMAGE = 'alpine'
|
||||||
|
- DIST_TAG = 'edge'
|
||||||
- MULTIARCH='true'
|
- MULTIARCH='true'
|
||||||
- CI='true'
|
- CI='true'
|
||||||
- CI_WEB='true'
|
- CI_WEB='true'
|
||||||
|
|||||||
@@ -1,191 +1,49 @@
|
|||||||
adduser3.118ubuntu2
|
alpine-baselayout-3.2.0-r23
|
||||||
apt2.0.4
|
alpine-baselayout-data-3.2.0-r23
|
||||||
apt-utils2.0.4
|
alpine-keys-2.4-r1
|
||||||
base-files11ubuntu5.3
|
apk-tools-2.12.9-r3
|
||||||
base-passwd3.5.47
|
bash-5.1.16-r2
|
||||||
bash5.0-6ubuntu1.1
|
brotli-libs-1.0.9-r6
|
||||||
bsdutils1:2.34-0.1ubuntu9.1
|
busybox-1.35.0-r17
|
||||||
bzip21.0.8-2
|
ca-certificates-20220614-r0
|
||||||
ca-certificates20210119~20.04.1
|
ca-certificates-bundle-20220614-r0
|
||||||
coreutils8.30-3ubuntu2
|
coreutils-9.1-r0
|
||||||
curl7.68.0-1ubuntu2.4
|
curl-7.83.1-r4
|
||||||
dash0.5.10.2-6
|
expat-2.5.0-r0
|
||||||
dbus1.12.16-2ubuntu2.1
|
gdbm-1.23-r0
|
||||||
debconf1.5.73
|
gmp-6.2.1-r2
|
||||||
debianutils4.9.1
|
jq-1.6-r1
|
||||||
diffutils1:3.7-3
|
libacl-2.3.1-r0
|
||||||
dirmngr2.2.19-3ubuntu2.1
|
libattr-2.5.1-r1
|
||||||
dpkg1.19.7ubuntu3
|
libbz2-1.0.8-r1
|
||||||
e2fsprogs1.45.5-2ubuntu1
|
libc-utils-0.7.2-r3
|
||||||
fdisk2.34-0.1ubuntu9.1
|
libcrypto1.1-1.1.1q-r0
|
||||||
file1:5.38-4
|
libcurl-7.83.1-r4
|
||||||
findutils4.7.0-1ubuntu1
|
libffi-3.4.2-r1
|
||||||
gcc-10-base10.2.0-5ubuntu1~20.04
|
libgcc-11.2.1_git20220219-r2
|
||||||
geoip-bin1.6.12-6build1
|
libintl-0.21-r2
|
||||||
geoip-database20191224-2
|
libproc-3.3.17-r1
|
||||||
gnupg2.2.19-3ubuntu2.1
|
libssl1.1-1.1.1q-r0
|
||||||
gnupg-l10n2.2.19-3ubuntu2.1
|
libstdc++-11.2.1_git20220219-r2
|
||||||
gnupg-utils2.2.19-3ubuntu2.1
|
linux-pam-1.5.2-r0
|
||||||
gpg2.2.19-3ubuntu2.1
|
mpdecimal-2.5.1-r1
|
||||||
gpg-agent2.2.19-3ubuntu2.1
|
musl-1.2.3-r1
|
||||||
gpgconf2.2.19-3ubuntu2.1
|
musl-utils-1.2.3-r0
|
||||||
gpgsm2.2.19-3ubuntu2.1
|
ncurses-libs-6.3_p20220521-r0
|
||||||
gpgv2.2.19-3ubuntu2.1
|
ncurses-terminfo-base-6.3_p20220521-r0
|
||||||
gpg-wks-client2.2.19-3ubuntu2.1
|
nghttp2-libs-1.47.0-r0
|
||||||
gpg-wks-server2.2.19-3ubuntu2.1
|
oniguruma-6.9.8-r0
|
||||||
grep3.4-1
|
p7zip-17.04-r2
|
||||||
gzip1.10-0ubuntu4
|
procps-3.3.17-r1
|
||||||
hostname3.23
|
python3-3.10.5-r0
|
||||||
init-system-helpers1.57
|
readline-8.1.2-r0
|
||||||
krb5-locales1.17-6ubuntu4.1
|
scanelf-1.3.4-r0
|
||||||
libacl12.2.53-6
|
shadow-4.10-r3
|
||||||
libapparmor12.13.3-7ubuntu5.1
|
skalibs-2.11.2.0-r0
|
||||||
libapt-pkg6.02.0.4
|
sqlite-libs-3.38.5-r0
|
||||||
libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
|
ssl_client-1.35.0-r17
|
||||||
libassuan02.5.3-7ubuntu2
|
tzdata-2022c-r0
|
||||||
libattr11:2.4.48-5
|
utmps-libs-0.1.2.0-r0
|
||||||
libaudit11:2.8.5-2ubuntu6
|
xz-5.2.5-r1
|
||||||
libaudit-common1:2.8.5-2ubuntu6
|
xz-libs-5.2.5-r1
|
||||||
libblkid12.34-0.1ubuntu9.1
|
zlib-1.2.12-r3
|
||||||
libbrotli11.0.7-6ubuntu0.1
|
|
||||||
libbz2-1.01.0.8-2
|
|
||||||
libc62.31-0ubuntu9.2
|
|
||||||
libcap-ng00.7.9-2.1build1
|
|
||||||
libc-bin2.31-0ubuntu9.2
|
|
||||||
libcom-err21.45.5-2ubuntu1
|
|
||||||
libcrypt11:4.4.10-10ubuntu4
|
|
||||||
libcurl47.68.0-1ubuntu2.4
|
|
||||||
libdb5.35.3.28+dfsg1-0.6ubuntu2
|
|
||||||
libdbus-1-31.12.16-2ubuntu2.1
|
|
||||||
libdebconfclient00.251ubuntu1
|
|
||||||
libdouble-conversion33.1.5-4ubuntu1
|
|
||||||
libexpat12.2.9-1build1
|
|
||||||
libext2fs21.45.5-2ubuntu1
|
|
||||||
libfdisk12.34-0.1ubuntu9.1
|
|
||||||
libffi73.3-4
|
|
||||||
libgcc-s110.2.0-5ubuntu1~20.04
|
|
||||||
libgcrypt201.8.5-5ubuntu1
|
|
||||||
libgdbm61.18.1-5
|
|
||||||
libgdbm-compat41.18.1-5
|
|
||||||
libgeoip11.6.12-6build1
|
|
||||||
libglib2.0-02.64.6-1~ubuntu20.04.1
|
|
||||||
libglib2.0-data2.64.6-1~ubuntu20.04.1
|
|
||||||
libgmp102:6.2.0+dfsg-4
|
|
||||||
libgnutls303.6.13-2ubuntu1.3
|
|
||||||
libgpg-error01.37-1
|
|
||||||
libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libgssapi-krb5-21.17-6ubuntu4.1
|
|
||||||
libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libhogweed53.5.1+really3.5.1-2
|
|
||||||
libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libicu6666.1-2ubuntu2
|
|
||||||
libidn2-02.2.0-2
|
|
||||||
libk5crypto31.17-6ubuntu4.1
|
|
||||||
libkeyutils11.6-6ubuntu1
|
|
||||||
libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libkrb5-31.17-6ubuntu4.1
|
|
||||||
libkrb5support01.17-6ubuntu4.1
|
|
||||||
libksba81.3.5-2
|
|
||||||
libldap-2.4-22.4.49+dfsg-2ubuntu1.6
|
|
||||||
libldap-common2.4.49+dfsg-2ubuntu1.6
|
|
||||||
liblz4-11.9.2-2
|
|
||||||
liblzma55.2.4-1ubuntu1
|
|
||||||
libmagic11:5.38-4
|
|
||||||
libmagic-mgc1:5.38-4
|
|
||||||
libmount12.34-0.1ubuntu9.1
|
|
||||||
libmpdec22.4.2-3
|
|
||||||
libncurses66.2-0ubuntu2
|
|
||||||
libncursesw66.2-0ubuntu2
|
|
||||||
libnetaddr-ip-perl4.079+dfsg-1build4
|
|
||||||
libnettle73.5.1+really3.5.1-2
|
|
||||||
libnghttp2-141.40.0-1build1
|
|
||||||
libnpth01.6-1
|
|
||||||
libp11-kit00.23.20-1ubuntu0.1
|
|
||||||
libpam0g1.3.1-5ubuntu4.1
|
|
||||||
libpam-modules1.3.1-5ubuntu4.1
|
|
||||||
libpam-modules-bin1.3.1-5ubuntu4.1
|
|
||||||
libpam-runtime1.3.1-5ubuntu4.1
|
|
||||||
libpcre2-16-010.34-7
|
|
||||||
libpcre2-8-010.34-7
|
|
||||||
libpcre32:8.39-12build1
|
|
||||||
libperl5.305.30.0-9ubuntu0.2
|
|
||||||
libprocps82:3.3.16-1ubuntu2
|
|
||||||
libpsl50.21.0-1ubuntu1
|
|
||||||
libpython3.8-minimal3.8.5-1~20.04
|
|
||||||
libpython3.8-stdlib3.8.5-1~20.04
|
|
||||||
libpython3-stdlib3.8.2-0ubuntu2
|
|
||||||
libqt5core5a5.12.8+dfsg-0ubuntu1
|
|
||||||
libqt5dbus55.12.8+dfsg-0ubuntu1
|
|
||||||
libqt5network55.12.8+dfsg-0ubuntu1
|
|
||||||
libqt5xml55.12.8+dfsg-0ubuntu1
|
|
||||||
libreadline88.0-4
|
|
||||||
libroken18-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
librtmp12.4+20151223.gitfa8646d.1-2build1
|
|
||||||
libsasl2-22.1.27+dfsg-2
|
|
||||||
libsasl2-modules2.1.27+dfsg-2
|
|
||||||
libsasl2-modules-db2.1.27+dfsg-2
|
|
||||||
libseccomp22.4.3-1ubuntu3.20.04.3
|
|
||||||
libselinux13.0-1build2
|
|
||||||
libsemanage13.0-1build2
|
|
||||||
libsemanage-common3.0-1build2
|
|
||||||
libsepol13.0-1
|
|
||||||
libsmartcols12.34-0.1ubuntu9.1
|
|
||||||
libsocket6-perl0.29-1build1
|
|
||||||
libsqlite3-03.31.1-4ubuntu0.2
|
|
||||||
libss21.45.5-2ubuntu1
|
|
||||||
libssh-40.9.3-2ubuntu2.1
|
|
||||||
libssl1.11.1.1f-1ubuntu2.1
|
|
||||||
libstdc++610.2.0-5ubuntu1~20.04
|
|
||||||
libsystemd0245.4-4ubuntu3.4
|
|
||||||
libtasn1-64.16.0-2
|
|
||||||
libtinfo66.2-0ubuntu2
|
|
||||||
libtorrent-rasterbar101.2.12+git20210118.3efdb8a941-1ppa1~20.04
|
|
||||||
libudev1245.4-4ubuntu3.4
|
|
||||||
libunistring20.9.10-2
|
|
||||||
libuuid12.34-0.1ubuntu9.1
|
|
||||||
libwind0-heimdal7.7.0+dfsg-1ubuntu1
|
|
||||||
libxml22.9.10+dfsg-5
|
|
||||||
libzstd11.4.4+dfsg-3
|
|
||||||
locales2.31-0ubuntu9.2
|
|
||||||
login1:4.8.1-1ubuntu5.20.04
|
|
||||||
logsave1.45.5-2ubuntu1
|
|
||||||
lsb-base11.1.0ubuntu2
|
|
||||||
mawk1.3.4.20200120-2
|
|
||||||
mime-support3.64ubuntu1
|
|
||||||
mount2.34-0.1ubuntu9.1
|
|
||||||
ncurses-base6.2-0ubuntu2
|
|
||||||
ncurses-bin6.2-0ubuntu2
|
|
||||||
netbase6.1
|
|
||||||
openssl1.1.1f-1ubuntu2.1
|
|
||||||
p7zip16.02+dfsg-7build1
|
|
||||||
p7zip-full16.02+dfsg-7build1
|
|
||||||
passwd1:4.8.1-1ubuntu5.20.04
|
|
||||||
perl5.30.0-9ubuntu0.2
|
|
||||||
perl-base5.30.0-9ubuntu0.2
|
|
||||||
perl-modules-5.305.30.0-9ubuntu0.2
|
|
||||||
pinentry-curses1.1.0-3build1
|
|
||||||
procps2:3.3.16-1ubuntu2
|
|
||||||
publicsuffix20200303.0012-1
|
|
||||||
python33.8.2-0ubuntu2
|
|
||||||
python3.83.8.5-1~20.04
|
|
||||||
python3.8-minimal3.8.5-1~20.04
|
|
||||||
python3-minimal3.8.2-0ubuntu2
|
|
||||||
qbittorrent-cli1.6.20334-1
|
|
||||||
qbittorrent-nox1:4.3.3.99~202101191832-7248-da0b276d5~ubuntu20.04.1
|
|
||||||
qttranslations5-l10n5.12.8-0ubuntu1
|
|
||||||
readline-common8.0-4
|
|
||||||
sed4.7-1
|
|
||||||
sensible-utils0.0.12+nmu1
|
|
||||||
shared-mime-info1.15-1
|
|
||||||
sysvinit-utils2.96-2.1ubuntu1
|
|
||||||
tar1.30+dfsg-7ubuntu0.20.04.1
|
|
||||||
tzdata2021a-0ubuntu0.20.04
|
|
||||||
ubuntu-keyring2020.02.11.2
|
|
||||||
unrar1:5.6.6-2build1
|
|
||||||
unzip6.0-25ubuntu1
|
|
||||||
util-linux2.34-0.1ubuntu9.1
|
|
||||||
xdg-user-dirs0.17-2ubuntu1
|
|
||||||
xz-utils5.2.4-1ubuntu1
|
|
||||||
zlib1g1:1.2.11.dfsg-2ubuntu1.2
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ available_architectures:
|
|||||||
development_versions: true
|
development_versions: true
|
||||||
development_versions_items:
|
development_versions_items:
|
||||||
- { tag: "latest", desc: "Stable qbittorrent releases" }
|
- { tag: "latest", desc: "Stable qbittorrent releases" }
|
||||||
- { tag: "unstable", desc: "Unstable qbittorrent releases" }
|
- { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
|
||||||
|
|
||||||
# container parameters
|
# container parameters
|
||||||
common_param_env_vars_enabled: true
|
common_param_env_vars_enabled: true
|
||||||
@@ -28,9 +28,9 @@ param_volumes:
|
|||||||
- { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
|
- { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Location of downloads on disk." }
|
||||||
param_usage_include_ports: true
|
param_usage_include_ports: true
|
||||||
param_ports:
|
param_ports:
|
||||||
|
- { external_port: "8080", internal_port: "8080", port_desc: "WebUI" }
|
||||||
- { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
|
- { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
|
||||||
- { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
|
- { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
|
||||||
- { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
|
|
||||||
param_usage_include_env: true
|
param_usage_include_env: true
|
||||||
param_env_vars:
|
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"}
|
||||||
@@ -47,7 +47,6 @@ app_setup_block: |
|
|||||||
|
|
||||||
Change username/password via the webui in the webui section of settings.
|
Change username/password via the webui in the webui section of settings.
|
||||||
|
|
||||||
|
|
||||||
### WEBUI_PORT variable
|
### WEBUI_PORT variable
|
||||||
|
|
||||||
Due to issues with CSRF and port mapping, should you require to alter the port for the webui 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 webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.
|
||||||
@@ -60,14 +59,27 @@ app_setup_block: |
|
|||||||
|
|
||||||
edit or add the following lines
|
edit or add the following lines
|
||||||
|
|
||||||
```
|
```text
|
||||||
WebUI\Address=*
|
WebUI\Address=*
|
||||||
|
|
||||||
WebUI\ServerDomains=*
|
WebUI\ServerDomains=*
|
||||||
```
|
```
|
||||||
|
|
||||||
|
If you are running a very old (3.x) kernel you may run into [this issue](https://github.com/linuxserver/docker-qbittorrent/issues/103) which can be worked around using [this method](https://github.com/linuxserver/docker-qbittorrent/issues/103#issuecomment-831238484)
|
||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "30.10.22:", desc: "Add libtorrent v1 branch." }
|
||||||
|
- { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
|
||||||
|
- { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
|
||||||
|
- { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
|
||||||
|
- { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
|
||||||
|
- { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
|
||||||
|
- { date: "01.03.22:", desc: "Add python for search plugin support." }
|
||||||
|
- { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
|
||||||
|
- { date: "19.02.22:", desc: "Add jq to build-stage" }
|
||||||
|
- { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
|
||||||
|
- { date: "06.01.22:", desc: "Deprecate unstable branch." }
|
||||||
- { date: "10.02.21:", desc: "Rebase to focal." }
|
- { date: "10.02.21:", desc: "Rebase to focal." }
|
||||||
- { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
|
- { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
|
||||||
- { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
|
- { date: "12.11.20:", desc: "Stop creating /config/data directory on startup" }
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
|
||||||
|
|
||||||
# make our folder
|
|
||||||
mkdir -p /config/qBittorrent
|
|
||||||
|
|
||||||
# copy config
|
|
||||||
[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
|
|
||||||
cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
|
|
||||||
|
|
||||||
# v4.3.3 BT_backup migration
|
|
||||||
[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
|
|
||||||
mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \
|
|
||||||
mkdir /config/qBittorrent/BT_backup/ && \
|
|
||||||
cp -a /config/data/qBittorrent/BT_backup/. /config/qBittorrent/BT_backup/ && \
|
|
||||||
mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
|
|
||||||
|
|
||||||
# chown download directory if currently not set to abc
|
|
||||||
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
|
|
||||||
chown -R abc:abc /downloads
|
|
||||||
fi
|
|
||||||
|
|
||||||
# permissions
|
|
||||||
chown -R abc:abc \
|
|
||||||
/config
|
|
||||||
20
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
Executable file
20
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
# make our folder
|
||||||
|
mkdir -p /config/qBittorrent
|
||||||
|
|
||||||
|
# copy default config
|
||||||
|
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 [[ -d /downloads ]]; then
|
||||||
|
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
|
||||||
|
chown -R abc:abc /downloads
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# permissions
|
||||||
|
chown -R abc:abc \
|
||||||
|
/config
|
||||||
1
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type
Normal file
@@ -0,0 +1 @@
|
|||||||
|
oneshot
|
||||||
1
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
3
|
||||||
7
root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
Executable file
7
root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
Executable file
@@ -0,0 +1,7 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
WEBUI_PORT=${WEBUI_PORT:-8080}
|
||||||
|
|
||||||
|
exec \
|
||||||
|
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
|
||||||
|
s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}"
|
||||||
1
root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type
Normal file
@@ -0,0 +1 @@
|
|||||||
|
longrun
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
|
||||||
|
|
||||||
WEBUI_PORT=${WEBUI_PORT:-8080}
|
|
||||||
|
|
||||||
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 /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
|
|
||||||
14
root/usr/bin/qbt
Executable file
14
root/usr/bin/qbt
Executable file
@@ -0,0 +1,14 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
# qbt bash wrapper to prompt user when trying to save password
|
||||||
|
if [[ "$@" == "settings set password" ]]; then
|
||||||
|
echo "Setting password is not supported"
|
||||||
|
echo "Please use --ask-for-password or --password"
|
||||||
|
elif [[ "$@" == "settings set"* ]]; then
|
||||||
|
/qbt/qbt "$@"
|
||||||
|
elif [[ "$@" != *"--ask-for-password"* ]] && [[ "$@" != *"--password"* ]];then
|
||||||
|
echo "Please use --ask-for-password or --password and ensure username/url are set"
|
||||||
|
/qbt/qbt "$@"
|
||||||
|
else
|
||||||
|
/qbt/qbt "$@"
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user