Compare commits
70 Commits
4.4.1-r0-l
...
4.4.5-r3-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3b95fdabf | ||
|
|
65621a9ba3 | ||
|
|
5f0e71b743 | ||
|
|
121cbb9462 | ||
|
|
ca5673a409 | ||
|
|
17dabb494e | ||
|
|
f196789a76 | ||
|
|
16364f2964 | ||
|
|
83b482ab7a | ||
|
|
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 |
8
.github/workflows/external_trigger.yml
vendored
8
.github/workflows/external_trigger.yml
vendored
@@ -49,8 +49,12 @@ jobs:
|
|||||||
| jq -r '.config.digest')
|
| jq -r '.config.digest')
|
||||||
image_info=$(curl -sL \
|
image_info=$(curl -sL \
|
||||||
--header "Authorization: Bearer ${token}" \
|
--header "Authorization: Bearer ${token}" \
|
||||||
"https://ghcr.io/v2/${image}/blobs/${digest}" \
|
"https://ghcr.io/v2/${image}/blobs/${digest}")
|
||||||
| jq -r '.container_config')
|
if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
|
||||||
|
image_info=$(echo $image_info | jq -r '.config')
|
||||||
|
else
|
||||||
|
image_info=$(echo $image_info | jq -r '.container_config')
|
||||||
|
fi
|
||||||
IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
|
IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
|
||||||
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
|
||||||
|
|||||||
13
Dockerfile
13
Dockerfile
@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
|||||||
LABEL maintainer="thespad"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG QBT_VERSION=1.7
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ARG UNRAR_VERSION=6.1.4
|
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
@@ -24,8 +23,6 @@ RUN \
|
|||||||
gcc && \
|
gcc && \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add -U --update --no-cache \
|
apk add -U --update --no-cache \
|
||||||
bash \
|
|
||||||
curl \
|
|
||||||
icu-libs \
|
icu-libs \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
openssl \
|
openssl \
|
||||||
@@ -50,9 +47,11 @@ RUN \
|
|||||||
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
||||||
echo "***** install qbitorrent-cli ****" && \
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
mkdir /qbt && \
|
mkdir /qbt && \
|
||||||
curl -L \
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
-o /tmp/qbt.tar.gz \
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
"https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt.tar.gz" && \
|
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 \
|
tar xf \
|
||||||
/tmp/qbt.tar.gz -C \
|
/tmp/qbt.tar.gz -C \
|
||||||
/qbt && \
|
/qbt && \
|
||||||
|
|||||||
@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
|||||||
LABEL maintainer="thespad"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG QBT_VERSION=1.7
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ARG UNRAR_VERSION=6.1.4
|
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
@@ -24,8 +23,6 @@ RUN \
|
|||||||
gcc && \
|
gcc && \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add -U --update --no-cache \
|
apk add -U --update --no-cache \
|
||||||
bash \
|
|
||||||
curl \
|
|
||||||
icu-libs \
|
icu-libs \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
openssl \
|
openssl \
|
||||||
@@ -50,9 +47,11 @@ RUN \
|
|||||||
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
||||||
echo "***** install qbitorrent-cli ****" && \
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
mkdir /qbt && \
|
mkdir /qbt && \
|
||||||
curl -L \
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
-o /tmp/qbt.tar.gz \
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
"https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm64.tar.gz" && \
|
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 \
|
tar xf \
|
||||||
/tmp/qbt.tar.gz -C \
|
/tmp/qbt.tar.gz -C \
|
||||||
/qbt && \
|
/qbt && \
|
||||||
|
|||||||
@@ -9,8 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
|||||||
LABEL maintainer="thespad"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG QBT_VERSION=1.7
|
ARG UNRAR_VERSION=6.1.7
|
||||||
ARG UNRAR_VERSION=6.1.4
|
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
XDG_CONFIG_HOME="/config" \
|
XDG_CONFIG_HOME="/config" \
|
||||||
XDG_DATA_HOME="/config"
|
XDG_DATA_HOME="/config"
|
||||||
@@ -24,9 +23,6 @@ RUN \
|
|||||||
gcc && \
|
gcc && \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add -U --update --no-cache \
|
apk add -U --update --no-cache \
|
||||||
bash \
|
|
||||||
curl \
|
|
||||||
gcompat \
|
|
||||||
icu-libs \
|
icu-libs \
|
||||||
libc6-compat \
|
libc6-compat \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
@@ -52,9 +48,11 @@ RUN \
|
|||||||
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
qbittorrent-nox==${QBITTORRENT_VERSION} && \
|
||||||
echo "***** install qbitorrent-cli ****" && \
|
echo "***** install qbitorrent-cli ****" && \
|
||||||
mkdir /qbt && \
|
mkdir /qbt && \
|
||||||
curl -L \
|
QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
|
||||||
-o /tmp/qbt.tar.gz \
|
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
|
||||||
"https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm.tar.gz" && \
|
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 \
|
tar xf \
|
||||||
/tmp/qbt.tar.gz -C \
|
/tmp/qbt.tar.gz -C \
|
||||||
/qbt && \
|
/qbt && \
|
||||||
|
|||||||
10
Jenkinsfile
vendored
10
Jenkinsfile
vendored
@@ -347,9 +347,11 @@ pipeline {
|
|||||||
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
|
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/
|
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, removing Unraid template"
|
echo "Image is on the ignore list, marking Unraid template as deprecated"
|
||||||
git rm unraid/${CONTAINER_NAME}.xml || :
|
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
|
||||||
git commit -m 'Bot Removing Deprecated Unraid Template' || :
|
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/
|
||||||
git add unraid/${CONTAINER_NAME}.xml
|
git add unraid/${CONTAINER_NAME}.xml
|
||||||
@@ -712,7 +714,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'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
README.md
45
README.md
@@ -46,25 +46,26 @@ 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 `lscr.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:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||||
|
|
||||||
The architectures supported by this image are:
|
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 |
|
||||||
|
| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
|
||||||
|
|
||||||
## Application Setup
|
## Application Setup
|
||||||
|
|
||||||
@@ -72,7 +73,6 @@ The webui is at `<your-ip>:8080` and the default username/password is `admin/adm
|
|||||||
|
|
||||||
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.
|
||||||
@@ -85,7 +85,7 @@ If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
|
|||||||
|
|
||||||
edit or add the following lines
|
edit or add the following lines
|
||||||
|
|
||||||
```
|
```text
|
||||||
WebUI\Address=*
|
WebUI\Address=*
|
||||||
|
|
||||||
WebUI\ServerDomains=*
|
WebUI\ServerDomains=*
|
||||||
@@ -104,7 +104,7 @@ Here are some example snippets to help you get started creating a container.
|
|||||||
version: "2.1"
|
version: "2.1"
|
||||||
services:
|
services:
|
||||||
qbittorrent:
|
qbittorrent:
|
||||||
image: lscr.io/linuxserver/qbittorrent
|
image: lscr.io/linuxserver/qbittorrent:latest
|
||||||
container_name: qbittorrent
|
container_name: qbittorrent
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
@@ -115,9 +115,9 @@ 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
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -130,13 +130,13 @@ docker run -d \
|
|||||||
-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 \
|
||||||
lscr.io/linuxserver/qbittorrent
|
lscr.io/linuxserver/qbittorrent:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
## Parameters
|
## Parameters
|
||||||
@@ -145,9 +145,9 @@ Container images are configured using parameters passed at runtime (such as thos
|
|||||||
|
|
||||||
| 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 |
|
||||||
@@ -198,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" }}' lscr.io/linuxserver/qbittorrent`
|
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/qbittorrent:latest`
|
||||||
|
|
||||||
## Updating Info
|
## Updating Info
|
||||||
|
|
||||||
@@ -216,7 +216,7 @@ Below are the instructions for updating containers:
|
|||||||
|
|
||||||
### Via Docker Run
|
### Via Docker Run
|
||||||
|
|
||||||
* Update the image: `docker pull lscr.io/linuxserver/qbittorrent`
|
* Update the image: `docker pull lscr.io/linuxserver/qbittorrent:latest`
|
||||||
* 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)
|
||||||
@@ -264,6 +264,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **31.10.22:** - Add libtorrentv1 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.
|
* **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.
|
||||||
* **01.03.22:** - Add python for search plugin support.
|
* **01.03.22:** - Add python for search plugin support.
|
||||||
* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
|
* **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.
|
||||||
|
|||||||
@@ -1,74 +1,64 @@
|
|||||||
alpine-baselayout-3.2.0-r19
|
alpine-baselayout-3.4.0-r0
|
||||||
|
alpine-baselayout-data-3.4.0-r0
|
||||||
alpine-keys-2.4-r1
|
alpine-keys-2.4-r1
|
||||||
apk-tools-2.12.9-r1
|
apk-tools-2.12.10-r1
|
||||||
bash-5.1.16-r0
|
bash-5.2.9-r0
|
||||||
brotli-libs-1.0.9-r6
|
brotli-libs-1.0.9-r9
|
||||||
busybox-1.35.0-r5
|
busybox-1.35.0-r27
|
||||||
ca-certificates-20211220-r0
|
busybox-binsh-1.35.0-r27
|
||||||
ca-certificates-bundle-20211220-r0
|
ca-certificates-20220614-r2
|
||||||
coreutils-9.0-r3
|
ca-certificates-bundle-20220614-r2
|
||||||
curl-7.81.0-r1
|
coreutils-9.1-r0
|
||||||
dbus-libs-1.12.22-r0
|
curl-7.86.0-r1
|
||||||
expat-2.4.7-r0
|
dbus-libs-1.14.4-r0
|
||||||
|
double-conversion-3.2.1-r0
|
||||||
gdbm-1.23-r0
|
gdbm-1.23-r0
|
||||||
glib-2.70.4-r0
|
glib-2.74.1-r2
|
||||||
icu-libs-70.1-r0
|
icu-data-en-72.1-r1
|
||||||
libacl-2.2.53-r0
|
icu-libs-72.1-r1
|
||||||
|
jq-1.6-r2
|
||||||
|
libacl-2.3.1-r1
|
||||||
libattr-2.5.1-r1
|
libattr-2.5.1-r1
|
||||||
libblkid-2.37.4-r1
|
libb2-0.98.1-r2
|
||||||
libbsd-0.11.5-r0
|
libblkid-2.38.1-r0
|
||||||
libbz2-1.0.8-r1
|
libbz2-1.0.8-r4
|
||||||
libc-utils-0.7.2-r3
|
libc-utils-0.7.2-r3
|
||||||
libcrypto1.1-1.1.1m-r3
|
libcrypto3-3.0.7-r0
|
||||||
libcurl-7.81.0-r1
|
libcurl-7.86.0-r1
|
||||||
libexecinfo-1.1-r1
|
libexpat-2.5.0-r0
|
||||||
libffi-3.4.2-r1
|
libffi-3.4.4-r0
|
||||||
libgcc-11.2.1_git20220219-r1
|
libgcc-12.2.1_git20220924-r4
|
||||||
libice-1.0.10-r0
|
libgomp-12.2.1_git20220924-r4
|
||||||
libintl-0.21-r1
|
libintl-0.21.1-r1
|
||||||
libmd-1.0.3-r0
|
libmount-2.38.1-r0
|
||||||
libmount-2.37.4-r1
|
libpcre2-16-10.40-r0
|
||||||
libpcre2-16-10.39-r0
|
libproc-3.3.17-r2
|
||||||
libproc-3.3.17-r1
|
libssl3-3.0.7-r0
|
||||||
libretls-3.4.2-r0
|
libstdc++-12.2.1_git20220924-r4
|
||||||
libsm-1.2.3-r0
|
libtorrent-rasterbar-2.0.8-r0
|
||||||
libssl1.1-1.1.1m-r3
|
linux-pam-1.5.2-r1
|
||||||
libstdc++-11.2.1_git20220219-r1
|
|
||||||
libtorrent-rasterbar-2.0.5-r2
|
|
||||||
libuuid-2.37.4-r1
|
|
||||||
libx11-1.7.3.1-r0
|
|
||||||
libxau-1.0.9-r0
|
|
||||||
libxcb-1.14-r2
|
|
||||||
libxdmcp-1.1.3-r0
|
|
||||||
libxext-1.3.4-r0
|
|
||||||
libxmu-1.1.3-r0
|
|
||||||
libxt-1.2.1-r0
|
|
||||||
linux-pam-1.5.2-r0
|
|
||||||
mpdecimal-2.5.1-r1
|
mpdecimal-2.5.1-r1
|
||||||
musl-1.2.2-r7
|
musl-1.2.3-r4
|
||||||
musl-utils-1.2.2-r7
|
musl-utils-1.2.3-r4
|
||||||
ncurses-libs-6.3_p20220219-r0
|
ncurses-libs-6.3_p20221112-r0
|
||||||
ncurses-terminfo-base-6.3_p20220219-r0
|
ncurses-terminfo-base-6.3_p20221112-r0
|
||||||
nghttp2-libs-1.47.0-r0
|
nghttp2-libs-1.51.0-r0
|
||||||
openssl-1.1.1m-r3
|
oniguruma-6.9.8-r0
|
||||||
p7zip-17.04-r2
|
openssl-3.0.7-r0
|
||||||
pcre-8.45-r2
|
p7zip-17.04-r3
|
||||||
procps-3.3.17-r1
|
pcre2-10.40-r0
|
||||||
python3-3.10.2-r0
|
procps-3.3.17-r2
|
||||||
qbittorrent-nox-4.4.1-r0
|
python3-3.10.8-r3
|
||||||
qt5-qtbase-5.15.3_git20220217-r0
|
qbittorrent-nox-4.4.5-r3
|
||||||
readline-8.1.2-r0
|
qt6-qtbase-6.4.1-r1
|
||||||
scanelf-1.3.3-r0
|
readline-8.2.0-r0
|
||||||
shadow-4.10-r3
|
scanelf-1.3.5-r1
|
||||||
skalibs-2.11.1.0-r0
|
shadow-4.13-r0
|
||||||
sqlite-libs-3.37.2-r0
|
skalibs-2.12.0.1-r0
|
||||||
ssl_client-1.35.0-r5
|
sqlite-libs-3.40.0-r0
|
||||||
tzdata-2021e-r0
|
ssl_client-1.35.0-r27
|
||||||
utmps-libs-0.1.1.0-r2
|
tzdata-2022f-r1
|
||||||
xdg-utils-1.1.3-r2
|
utmps-libs-0.1.2.0-r1
|
||||||
xprop-1.2.5-r0
|
xz-5.2.8-r0
|
||||||
xset-1.2.4-r0
|
xz-libs-5.2.8-r0
|
||||||
xz-5.2.5-r0
|
zlib-1.2.13-r0
|
||||||
xz-libs-5.2.5-r0
|
|
||||||
zlib-1.2.11-r3
|
|
||||||
zstd-libs-1.5.2-r0
|
|
||||||
|
|||||||
@@ -17,6 +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: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
|
||||||
|
|
||||||
# container parameters
|
# container parameters
|
||||||
common_param_env_vars_enabled: true
|
common_param_env_vars_enabled: true
|
||||||
@@ -27,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"}
|
||||||
@@ -46,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.
|
||||||
@@ -59,7 +59,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
edit or add the following lines
|
edit or add the following lines
|
||||||
|
|
||||||
```
|
```text
|
||||||
WebUI\Address=*
|
WebUI\Address=*
|
||||||
|
|
||||||
WebUI\ServerDomains=*
|
WebUI\ServerDomains=*
|
||||||
@@ -69,6 +69,11 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "31.10.22:", desc: "Add libtorrentv1 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: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }
|
||||||
- { date: "01.03.22:", desc: "Add python for search plugin support." }
|
- { 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: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }
|
||||||
|
|||||||
@@ -1,26 +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 [[ -d /downloads ]]; then
|
|
||||||
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
|
|
||||||
chown -R abc:abc /downloads
|
|
||||||
fi
|
|
||||||
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
|
||||||
|
lsiown -R abc:abc /downloads
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# permissions
|
||||||
|
lsiown -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 /usr/bin/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,6 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
|
||||||
|
|
||||||
WEBUI_PORT=${WEBUI_PORT:-8080}
|
|
||||||
|
|
||||||
exec \
|
|
||||||
s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
|
|
||||||
Reference in New Issue
Block a user