Compare commits

...

22 Commits

Author SHA1 Message Date
LinuxServer-CI
1a86e4df8f Bot Updating Package Versions 2023-02-26 13:01:28 +01:00
LinuxServer-CI
d1c2eb9de7 Bot Updating Templated Files 2023-02-26 12:57:32 +01:00
Adam
637d9ebfe5 Merge pull request #230 from SinTan1729/master 2023-02-26 11:56:08 +00:00
SinTan1729
3c99647cc9 Add qt6-qtbase-sqlite to support SQLite database for resume files 2023-02-23 22:16:00 -06:00
LinuxServer-CI
8139611966 Bot Updating Package Versions 2023-02-20 04:48:20 +01:00
LinuxServer-CI
81d2117056 Bot Updating Package Versions 2023-02-13 01:49:40 -06:00
LinuxServer-CI
66c061972d Bot Updating Package Versions 2023-02-12 21:52:31 -06:00
LinuxServer-CI
f11127fc32 Bot Updating Templated Files 2023-02-13 04:48:25 +01:00
LinuxServer-CI
640ae3e999 Bot Updating Templated Files 2023-02-13 04:47:08 +01:00
LinuxServer-CI
aed8420354 Bot Updating Package Versions 2023-02-05 21:47:58 -06:00
LinuxServer-CI
a3a1398b16 Bot Updating Package Versions 2023-01-30 04:48:09 +01:00
LinuxServer-CI
b68208bdbc Bot Updating Package Versions 2023-01-22 21:48:04 -06:00
LinuxServer-CI
538b1ac1a2 Bot Updating Package Versions 2023-01-15 08:58:32 -06:00
Adam
af5ae7b15b Merge pull request #220 from linuxserver/buildbase-master 2023-01-15 14:55:47 +00:00
TheSpad
b3d6e8e631 Use build-base meta package for building unrar 2023-01-15 14:21:18 +00:00
LinuxServer-CI
d5288897f7 Bot Updating Package Versions 2023-01-08 21:48:09 -06:00
LinuxServer-CI
c9be56f0df Bot Updating Package Versions 2023-01-02 04:48:09 +01:00
LinuxServer-CI
7ffac23daa Bot Updating Package Versions 2022-12-25 21:48:15 -06:00
LinuxServer-CI
09d0018747 Bot Updating Package Versions 2022-12-22 03:04:27 +01:00
LinuxServer-CI
49f9389de4 Bot Updating Package Versions 2022-12-19 04:48:14 +01:00
LinuxServer-CI
941102a69f Bot Updating Package Versions 2022-12-12 04:48:15 +01:00
LinuxServer-CI
281e720b3c Bot Updating Package Versions 2022-12-04 21:47:50 -06:00
12 changed files with 95 additions and 80 deletions

View File

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
indent_style = space
indent_size = 2
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
indent_style = space
indent_size = 4

View File

@@ -8,6 +8,6 @@ jobs:
steps:
- uses: actions/first-interaction@v1
with:
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-qbittorrent/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
repo-token: ${{ secrets.GITHUB_TOKEN }}

9
.github/workflows/permissions.yml vendored Executable file
View File

@@ -0,0 +1,9 @@
name: Permission check
on:
pull_request:
paths:
- '**/run'
- '**/finish'
jobs:
permission_check:
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

View File

@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:edge
# set version label
@@ -18,9 +20,7 @@ XDG_DATA_HOME="/config"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
make \
g++ \
gcc && \
build-base && \
echo "**** install packages ****" && \
apk add -U --update --no-cache \
icu-libs \
@@ -28,7 +28,8 @@ RUN \
openssl \
openssl1.1-compat \
p7zip \
python3 && \
python3 \
qt6-qtbase-sqlite && \
echo "**** install unrar from source ****" && \
mkdir /tmp/unrar && \
curl -o \

View File

@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
# set version label
@@ -18,9 +20,7 @@ XDG_DATA_HOME="/config"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
make \
g++ \
gcc && \
build-base && \
echo "**** install packages ****" && \
apk add -U --update --no-cache \
icu-libs \
@@ -28,7 +28,8 @@ RUN \
openssl \
openssl1.1-compat \
p7zip \
python3 && \
python3 \
qt6-qtbase-sqlite && \
echo "**** install unrar from source ****" && \
mkdir /tmp/unrar && \
curl -o \

View File

@@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge
# set version label
@@ -18,9 +20,7 @@ XDG_DATA_HOME="/config"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
make \
g++ \
gcc && \
build-base && \
echo "**** install packages ****" && \
apk add -U --update --no-cache \
icu-libs \
@@ -28,7 +28,8 @@ RUN \
openssl \
openssl1.1-compat \
p7zip \
python3 && \
python3 \
qt6-qtbase-sqlite && \
echo "**** install unrar from source ****" && \
mkdir /tmp/unrar && \
curl -o \

26
Jenkinsfile vendored
View File

@@ -59,7 +59,7 @@ pipeline {
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
env.PULL_REQUEST = env.CHANGE_ID
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
}
script{
env.LS_RELEASE_NUMBER = sh(
@@ -809,19 +809,19 @@ pipeline {
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
if [ "${CI}" == "false" ]; then
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
if [ -n "${SEMVER}" ]; then
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -829,13 +829,13 @@ pipeline {
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
fi
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker push ${MANIFESTIMAGE}:amd64-latest
docker push ${MANIFESTIMAGE}:arm32v7-latest
docker push ${MANIFESTIMAGE}:arm64v8-latest
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:amd64-latest
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-latest
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-latest
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
if [ -n "${SEMVER}" ]; then
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -981,12 +981,12 @@ pipeline {
sh 'echo "build aborted"'
}
else if (currentBuild.currentResult == "SUCCESS"){
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
}
else {
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
}

View File

@@ -56,7 +56,7 @@ The architectures supported by this image are:
| :----: | :----: | ---- |
| x86-64 | ✅ | amd64-\<version tag\> |
| arm64 | ✅ | arm64v8-\<version tag\> |
| armhf| ✅ | arm32v7-\<version tag\> |
| armhf | ✅ | arm32v7-\<version tag\> |
## Version Tags
@@ -66,7 +66,6 @@ This image provides various versions that are available via tags. Please read th
| :----: | :----: |--- |
| latest | ✅ | Stable 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`.
@@ -109,7 +108,7 @@ services:
environment:
- PUID=1000
- PGID=1000
- TZ=Europe/London
- TZ=Etc/UTC
- WEBUI_PORT=8080
volumes:
- /path/to/appdata/config:/config
@@ -128,7 +127,7 @@ docker run -d \
--name=qbittorrent \
-e PUID=1000 \
-e PGID=1000 \
-e TZ=Europe/London \
-e TZ=Etc/UTC \
-e WEBUI_PORT=8080 \
-p 8080:8080 \
-p 6881:6881 \
@@ -137,6 +136,7 @@ docker run -d \
-v /path/to/downloads:/downloads \
--restart unless-stopped \
lscr.io/linuxserver/qbittorrent:latest
```
## Parameters
@@ -150,7 +150,7 @@ Container images are configured using parameters passed at runtime (such as thos
| `-p 6881/udp` | udp connection port |
| `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1000` | for GroupID - see below for explanation |
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
| `-v /config` | Contains all relevant configuration files. |
| `-v /downloads` | Location of downloads on disk. |
@@ -264,6 +264,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **23.02.23:** - Add qt6-qtbase-sqlite to support SQLite database for resume files.
* **29.11.22:** - Add openssl1.1-compat for qbittorrent-cli.
* **31.10.22:** - Add libtorrentv1 branch.
* **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.

View File

@@ -1,67 +1,66 @@
alpine-baselayout-3.4.0-r0
alpine-baselayout-data-3.4.0-r0
alpine-keys-2.4-r1
apk-tools-2.12.10-r1
bash-5.2.9-r0
apk-tools-2.12.11-r0
bash-5.2.15-r0
brotli-libs-1.0.9-r10
busybox-1.35.0-r29
busybox-binsh-1.35.0-r29
ca-certificates-20220614-r2
ca-certificates-bundle-20220614-r2
busybox-1.36.0-r4
busybox-binsh-1.36.0-r4
ca-certificates-20230106-r0
ca-certificates-bundle-20230106-r0
coreutils-9.1-r0
curl-7.86.0-r1
dbus-libs-1.14.4-r0
curl-7.88.1-r0
dbus-libs-1.14.6-r1
double-conversion-3.2.1-r0
gdbm-1.23-r0
glib-2.74.2-r0
icu-data-en-72.1-r1
icu-libs-72.1-r1
glib-2.74.6-r0
icu-data-en-72.1-r2
icu-libs-72.1-r2
jq-1.6-r2
libacl-2.3.1-r1
libattr-2.5.1-r1
libattr-2.5.1-r3
libb2-0.98.1-r2
libblkid-2.38.1-r1
libblkid-2.38.1-r5
libbz2-1.0.8-r4
libc-utils-0.7.2-r3
libcrypto1.1-1.1.1s-r0
libcrypto3-3.0.7-r0
libcurl-7.86.0-r1
libc-utils-0.7.2-r4
libcrypto1.1-1.1.1t-r0
libcrypto3-3.0.8-r0
libcurl-7.88.1-r0
libexpat-2.5.0-r0
libffi-3.4.4-r0
libgcc-12.2.1_git20220924-r4
libgomp-12.2.1_git20220924-r4
libgcc-12.2.1_git20220924-r9
libgomp-12.2.1_git20220924-r9
libintl-0.21.1-r1
libmount-2.38.1-r1
libpcre2-16-10.40-r0
libproc-3.3.17-r2
libssl1.1-1.1.1s-r0
libssl3-3.0.7-r0
libstdc++-12.2.1_git20220924-r4
libtorrent-rasterbar-2.0.8-r1
linux-pam-1.5.2-r1
libmount-2.38.1-r5
libncursesw-6.4_p20230218-r3
libpanelw-6.4_p20230218-r3
libpcre2-16-10.42-r0
libssl1.1-1.1.1t-r0
libssl3-3.0.8-r0
libstdc++-12.2.1_git20220924-r9
libtorrent-rasterbar-2.0.8-r2
linux-pam-1.5.2-r3
mpdecimal-2.5.1-r1
musl-1.2.3-r4
musl-utils-1.2.3-r4
ncurses-libs-6.3_p20221126-r0
ncurses-terminfo-base-6.3_p20221126-r0
nghttp2-libs-1.51.0-r0
ncurses-terminfo-base-6.4_p20230218-r3
nghttp2-libs-1.52.0-r0
oniguruma-6.9.8-r0
openssl-3.0.7-r0
openssl1.1-compat-1.1.1s-r0
p7zip-17.04-r3
pcre2-10.40-r0
procps-3.3.17-r2
python3-3.11.0-r2
qbittorrent-nox-4.5.0-r0
qt6-qtbase-6.4.1-r1
readline-8.2.0-r0
scanelf-1.3.5-r1
shadow-4.13-r0
skalibs-2.12.0.1-r0
sqlite-libs-3.40.0-r0
ssl_client-1.35.0-r29
tzdata-2022f-r1
utmps-libs-0.1.2.0-r1
xz-5.2.8-r0
xz-libs-5.2.8-r0
openssl-3.0.8-r0
openssl1.1-compat-1.1.1t-r0
p7zip-17.05-r1
pcre2-10.42-r0
python3-3.11.2-r0
qbittorrent-nox-4.5.1-r1
qt6-qtbase-6.4.2-r0
qt6-qtbase-sqlite-6.4.2-r0
readline-8.2.001-r0
scanelf-1.3.7-r0
shadow-4.13-r1
skalibs-2.13.1.0-r0
sqlite-libs-3.41.0-r0
ssl_client-1.36.0-r4
tzdata-2022g-r0
utmps-libs-0.1.2.1-r0
xz-libs-5.4.1-r0
zlib-1.2.13-r0

View File

@@ -69,6 +69,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "23.02.23:", desc: "Add qt6-qtbase-sqlite to support SQLite database for resume files."}
- { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
- { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
- { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }

View File

@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
# make our folder
mkdir -p /config/qBittorrent

View File

@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
WEBUI_PORT=${WEBUI_PORT:-8080}