Compare commits
57 Commits
unstable-4
...
unstable-4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
069f2e478f | ||
|
|
26845a6212 | ||
|
|
2b49c7771d | ||
|
|
96c2fd9679 | ||
|
|
2d67ce6bef | ||
|
|
2562055f34 | ||
|
|
707c99cae2 | ||
|
|
11762d97ef | ||
|
|
510a03bffb | ||
|
|
3235a56a7f | ||
|
|
fce48244de | ||
|
|
d169139acc | ||
|
|
ce55eb7678 | ||
|
|
6af0518f7c | ||
|
|
48973d7aa4 | ||
|
|
babdcc82d0 | ||
|
|
34004896f5 | ||
|
|
ebf5f0b42d | ||
|
|
ba0a3860ff | ||
|
|
85a41777c7 | ||
|
|
83f792a5c6 | ||
|
|
0b816db909 | ||
|
|
5d9b360986 | ||
|
|
b72cd90227 | ||
|
|
47f9b1a9a2 | ||
|
|
7db91039a8 | ||
|
|
0071db8201 | ||
|
|
74278dfca6 | ||
|
|
6c9e6617a5 | ||
|
|
0664cb2fbf | ||
|
|
dc3fbe4bd4 | ||
|
|
cf815c30c0 | ||
|
|
ceac260908 | ||
|
|
8628f22bd0 | ||
|
|
df343cb451 | ||
|
|
d0ac91804a | ||
|
|
463a2ce2aa | ||
|
|
a42aa10d77 | ||
|
|
e96479f302 | ||
|
|
60dae1c258 | ||
|
|
de3d031cc0 | ||
|
|
c6367a0f92 | ||
|
|
5946838097 | ||
|
|
3968819935 | ||
|
|
f621acf436 | ||
|
|
1acc264578 | ||
|
|
384d611e66 | ||
|
|
931d8dd0c2 | ||
|
|
a4a5dd92b0 | ||
|
|
3120dca15e | ||
|
|
d885e13383 | ||
|
|
8d1a0f0a3a | ||
|
|
38c24747c4 | ||
|
|
0330ebcfae | ||
|
|
40f3ee4dc5 | ||
|
|
1139d54df5 | ||
|
|
2cc991bb65 |
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
|
||||
2
.github/CONTRIBUTING.md
vendored
2
.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.
|
||||
* 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 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)
|
||||
|
||||
|
||||
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -6,7 +6,7 @@
|
||||
|
||||
<!--- 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/ -->
|
||||
<!--- 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 -->
|
||||
|
||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v1
|
||||
- uses: actions/stale@v3
|
||||
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-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."
|
||||
|
||||
60
Dockerfile
60
Dockerfile
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
|
||||
|
||||
# add repo and install qbitorrent
|
||||
RUN \
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
# ports and volumes
|
||||
EXPOSE 6881 6881/udp 8080
|
||||
VOLUME /config /downloads
|
||||
VOLUME /config
|
||||
|
||||
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
|
||||
|
||||
# add repo and install qbitorrent
|
||||
RUN \
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
# ports and volumes
|
||||
EXPOSE 6881 6881/udp 8080
|
||||
VOLUME /config /downloads
|
||||
VOLUME /config
|
||||
|
||||
@@ -15,39 +15,39 @@ XDG_DATA_HOME="/config"
|
||||
|
||||
# add repo and install qbitorrent
|
||||
RUN \
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://bintray.com/user/downloadSubjectPublicKey?username=fedarovich | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
echo "***** add qbitorrent repositories ****" && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python3 && \
|
||||
curl -s https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/gpg.F8756541ADDA2B7D.key | apt-key add - && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 7CA69FC4 && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.cloudsmith.io/public/qbittorrent-cli/qbittorrent-cli/deb/ubuntu focal main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "**** install packages ****" && \
|
||||
if [ -z ${QBITTORRENT_VERSION+x} ]; then \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
|grep -A 7 -m 1 "Package: qbittorrent-nox" | awk -F ": " '/Version/{print $2;exit}');\
|
||||
fi && \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
p7zip-full \
|
||||
qbittorrent-cli \
|
||||
qbittorrent-nox=${QBITTORRENT_VERSION} \
|
||||
unrar \
|
||||
geoip-bin \
|
||||
unzip && \
|
||||
echo "**** cleanup ****" && \
|
||||
apt-get clean && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
# ports and volumes
|
||||
EXPOSE 6881 6881/udp 8080
|
||||
VOLUME /config /downloads
|
||||
VOLUME /config
|
||||
|
||||
27
Jenkinsfile
vendored
27
Jenkinsfile
vendored
@@ -55,7 +55,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 ./.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/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.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/package_trigger.yml'
|
||||
}
|
||||
script{
|
||||
env.LS_RELEASE_NUMBER = sh(
|
||||
@@ -260,7 +260,6 @@ pipeline {
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||
git checkout -f unstable
|
||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
for i in ${TEMPLATES_TO_DELETE}; do
|
||||
git rm "${i}"
|
||||
done
|
||||
@@ -376,7 +375,9 @@ pipeline {
|
||||
// Build Docker container for push to LS Repo
|
||||
stage('Build-Single') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'false'
|
||||
expression {
|
||||
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -401,7 +402,10 @@ pipeline {
|
||||
// Build MultiArch Docker containers for push to LS Repo
|
||||
stage('Build-Multi') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
allOf {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
expression { params.PACKAGE_CHECK == 'false' }
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
parallel {
|
||||
@@ -506,7 +510,7 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||
@@ -521,6 +525,15 @@ pipeline {
|
||||
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 && \
|
||||
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
|
||||
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"
|
||||
@@ -558,7 +571,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
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}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
@@ -582,7 +595,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
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}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
|
||||
@@ -33,7 +33,6 @@ Find us at:
|
||||
[](https://github.com/linuxserver/docker-qbittorrent/releases)
|
||||
[](https://github.com/linuxserver/docker-qbittorrent/packages)
|
||||
[](https://gitlab.com/linuxserver.io/docker-qbittorrent/container_registry)
|
||||
[](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
|
||||
[](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/unstable/)
|
||||
@@ -91,13 +90,13 @@ 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
|
||||
|
||||
Here are some example snippets to help you get started creating a container.
|
||||
|
||||
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
Compatible with docker-compose v2 schemas.
|
||||
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
```yaml
|
||||
---
|
||||
@@ -121,7 +120,7 @@ services:
|
||||
restart: unless-stopped
|
||||
```
|
||||
|
||||
### docker cli
|
||||
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
|
||||
|
||||
```bash
|
||||
docker run -d \
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
adduser3.118ubuntu2
|
||||
apt2.0.5
|
||||
apt-utils2.0.5
|
||||
base-files11ubuntu5.3
|
||||
apt2.0.6
|
||||
apt-utils2.0.6
|
||||
base-files11ubuntu5.4
|
||||
base-passwd3.5.47
|
||||
bash5.0-6ubuntu1.1
|
||||
bsdutils1:2.34-0.1ubuntu9.1
|
||||
bzip21.0.8-2
|
||||
ca-certificates20210119~20.04.1
|
||||
coreutils8.30-3ubuntu2
|
||||
curl7.68.0-1ubuntu2.5
|
||||
curl7.68.0-1ubuntu2.6
|
||||
dash0.5.10.2-6
|
||||
dbus1.12.16-2ubuntu2.1
|
||||
debconf1.5.73
|
||||
@@ -20,7 +20,7 @@ e2fsprogs1.45.5-2ubuntu1
|
||||
fdisk2.34-0.1ubuntu9.1
|
||||
file1:5.38-4
|
||||
findutils4.7.0-1ubuntu1
|
||||
gcc-10-base10.2.0-5ubuntu1~20.04
|
||||
gcc-10-base10.3.0-1ubuntu1~20.04
|
||||
geoip-bin1.6.12-6build1
|
||||
geoip-database20191224-2
|
||||
gnupg2.2.19-3ubuntu2.1
|
||||
@@ -40,7 +40,7 @@ init-system-helpers1.57
|
||||
krb5-locales1.17-6ubuntu4.1
|
||||
libacl12.2.53-6
|
||||
libapparmor12.13.3-7ubuntu5.1
|
||||
libapt-pkg6.02.0.5
|
||||
libapt-pkg6.02.0.6
|
||||
libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
|
||||
libassuan02.5.3-7ubuntu2
|
||||
libattr11:2.4.48-5
|
||||
@@ -54,7 +54,7 @@ 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.5
|
||||
libcurl47.68.0-1ubuntu2.6
|
||||
libdb5.35.3.28+dfsg1-0.6ubuntu2
|
||||
libdbus-1-31.12.16-2ubuntu2.1
|
||||
libdebconfclient00.251ubuntu1
|
||||
@@ -63,22 +63,22 @@ libexpat12.2.9-1build1
|
||||
libext2fs21.45.5-2ubuntu1
|
||||
libfdisk12.34-0.1ubuntu9.1
|
||||
libffi73.3-4
|
||||
libgcc-s110.2.0-5ubuntu1~20.04
|
||||
libgcc-s110.3.0-1ubuntu1~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.3
|
||||
libglib2.0-data2.64.6-1~ubuntu20.04.3
|
||||
libglib2.0-02.64.6-1~ubuntu20.04.4
|
||||
libglib2.0-data2.64.6-1~ubuntu20.04.4
|
||||
libgmp102:6.2.0+dfsg-4
|
||||
libgnutls303.6.13-2ubuntu1.3
|
||||
libgnutls303.6.13-2ubuntu1.6
|
||||
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
|
||||
libhogweed53.5.1+really3.5.1-2ubuntu0.2
|
||||
libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
|
||||
libicu6666.1-2ubuntu2
|
||||
libidn2-02.2.0-2
|
||||
@@ -88,9 +88,9 @@ 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.7
|
||||
libldap-common2.4.49+dfsg-2ubuntu1.7
|
||||
liblz4-11.9.2-2
|
||||
libldap-2.4-22.4.49+dfsg-2ubuntu1.8
|
||||
libldap-common2.4.49+dfsg-2ubuntu1.8
|
||||
liblz4-11.9.2-2ubuntu0.20.04.1
|
||||
liblzma55.2.4-1ubuntu1
|
||||
libmagic11:5.38-4
|
||||
libmagic-mgc1:5.38-4
|
||||
@@ -99,26 +99,28 @@ libmpdec22.4.2-3
|
||||
libncurses66.2-0ubuntu2
|
||||
libncursesw66.2-0ubuntu2
|
||||
libnetaddr-ip-perl4.079+dfsg-1build4
|
||||
libnettle73.5.1+really3.5.1-2
|
||||
libnettle73.5.1+really3.5.1-2ubuntu0.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
|
||||
libpam0g1.3.1-5ubuntu4.2
|
||||
libpam-modules1.3.1-5ubuntu4.2
|
||||
libpam-modules-bin1.3.1-5ubuntu4.2
|
||||
libpam-runtime1.3.1-5ubuntu4.2
|
||||
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
|
||||
libprocps82:3.3.16-1ubuntu2.2
|
||||
libpsl50.21.0-1ubuntu1
|
||||
libpython3.8-minimal3.8.5-1~20.04.2
|
||||
libpython3.8-stdlib3.8.5-1~20.04.2
|
||||
libpython3.8-minimal3.8.10-0ubuntu1~20.04
|
||||
libpython3.8-stdlib3.8.10-0ubuntu1~20.04
|
||||
libpython3-stdlib3.8.2-0ubuntu2
|
||||
libqt5core5a5.12.8+dfsg-0ubuntu1
|
||||
libqt5dbus55.12.8+dfsg-0ubuntu1
|
||||
libqt5network55.12.8+dfsg-0ubuntu1
|
||||
libqt5sql55.12.8+dfsg-0ubuntu1
|
||||
libqt5sql5-sqlite5.12.8+dfsg-0ubuntu1
|
||||
libqt5xml55.12.8+dfsg-0ubuntu1
|
||||
libreadline88.0-4
|
||||
libroken18-heimdal7.7.0+dfsg-1ubuntu1
|
||||
@@ -126,7 +128,7 @@ 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
|
||||
libseccomp22.5.1-1ubuntu1~20.04.1
|
||||
libselinux13.0-1build2
|
||||
libsemanage13.0-1build2
|
||||
libsemanage-common3.0-1build2
|
||||
@@ -136,20 +138,20 @@ 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.3
|
||||
libstdc++610.2.0-5ubuntu1~20.04
|
||||
libsystemd0245.4-4ubuntu3.6
|
||||
libssl1.11.1.1f-1ubuntu2.5
|
||||
libstdc++610.3.0-1ubuntu1~20.04
|
||||
libsystemd0245.4-4ubuntu3.11
|
||||
libtasn1-64.16.0-2
|
||||
libtinfo66.2-0ubuntu2
|
||||
libtorrent-rasterbar101.2.13+git20210323.34a979720b-1ppa1~20.04
|
||||
libudev1245.4-4ubuntu3.6
|
||||
libtorrent-rasterbar101.2.14+git20210623.c996ed7ef7-1ppa1~20.04
|
||||
libudev1245.4-4ubuntu3.11
|
||||
libunistring20.9.10-2
|
||||
libuuid12.34-0.1ubuntu9.1
|
||||
libwind0-heimdal7.7.0+dfsg-1ubuntu1
|
||||
libxml22.9.10+dfsg-5
|
||||
libxml22.9.10+dfsg-5ubuntu0.20.04.1
|
||||
libzstd11.4.4+dfsg-3ubuntu0.1
|
||||
locales2.31-0ubuntu9.2
|
||||
login1:4.8.1-1ubuntu5.20.04
|
||||
login1:4.8.1-1ubuntu5.20.04.1
|
||||
logsave1.45.5-2ubuntu1
|
||||
lsb-base11.1.0ubuntu2
|
||||
mawk1.3.4.20200120-2
|
||||
@@ -158,22 +160,22 @@ mount2.34-0.1ubuntu9.1
|
||||
ncurses-base6.2-0ubuntu2
|
||||
ncurses-bin6.2-0ubuntu2
|
||||
netbase6.1
|
||||
openssl1.1.1f-1ubuntu2.3
|
||||
openssl1.1.1f-1ubuntu2.5
|
||||
p7zip16.02+dfsg-7build1
|
||||
p7zip-full16.02+dfsg-7build1
|
||||
passwd1:4.8.1-1ubuntu5.20.04
|
||||
passwd1:4.8.1-1ubuntu5.20.04.1
|
||||
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
|
||||
procps2:3.3.16-1ubuntu2.2
|
||||
publicsuffix20200303.0012-1
|
||||
python33.8.2-0ubuntu2
|
||||
python3.83.8.5-1~20.04.2
|
||||
python3.8-minimal3.8.5-1~20.04.2
|
||||
python3.83.8.10-0ubuntu1~20.04
|
||||
python3.8-minimal3.8.10-0ubuntu1~20.04
|
||||
python3-minimal3.8.2-0ubuntu2
|
||||
qbittorrent-cli1.6.20334-1
|
||||
qbittorrent-nox4.4.0~202104190703-7279-a4ce5d168~ubuntu20.04.1
|
||||
qbittorrent-cli1.7.21116-1
|
||||
qbittorrent-nox4.4.0~202106140855-7320-2bd5aca3a~ubuntu20.04.1
|
||||
qttranslations5-l10n5.12.8-0ubuntu1
|
||||
readline-common8.0-4
|
||||
sed4.7-1
|
||||
|
||||
@@ -65,6 +65,8 @@ app_setup_block: |
|
||||
|
||||
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
|
||||
changelogs:
|
||||
|
||||
@@ -10,8 +10,10 @@ mkdir -p \
|
||||
cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
|
||||
|
||||
# chown download directory if currently set to root
|
||||
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
|
||||
chown -R abc:abc /downloads
|
||||
if [[ -d /downloads ]]; then
|
||||
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
|
||||
chown -R abc:abc /downloads
|
||||
fi
|
||||
fi
|
||||
|
||||
# permissions
|
||||
|
||||
Reference in New Issue
Block a user