Compare commits
22 Commits
14.2.3.992
...
4.3.020191
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0613934e6b | ||
|
|
40d19347c3 | ||
|
|
47d58f9e4d | ||
|
|
ece00294b1 | ||
|
|
5c8677d600 | ||
|
|
788d8fb753 | ||
|
|
c7e7c1c222 | ||
|
|
634fcd0f7d | ||
|
|
8f0acdeb52 | ||
|
|
e7f77f2ffc | ||
|
|
44fe098e99 | ||
|
|
9a220e3eee | ||
|
|
ad31b8c925 | ||
|
|
cb7a875129 | ||
|
|
cc700c5af2 | ||
|
|
fa140d452d | ||
|
|
02fe01a63a | ||
|
|
d9b8488135 | ||
|
|
20b308df2c | ||
|
|
419f0ae428 | ||
|
|
8766fd9a5c | ||
|
|
60da66b714 |
11
Dockerfile
11
Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG QBITTORRENT_VERSION
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="sparklyballs, thelamer"
|
||||
LABEL maintainer="thelamer"
|
||||
|
||||
# environment settings
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
@@ -19,16 +19,15 @@ RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python \
|
||||
python3 && \
|
||||
python && \
|
||||
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-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic 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-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/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 && \
|
||||
|
||||
@@ -5,7 +5,7 @@ ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG QBITTORRENT_VERSION
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="sparklyballs, thelamer"
|
||||
LABEL maintainer="thelamer"
|
||||
|
||||
# environment settings
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
@@ -19,16 +19,15 @@ RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python \
|
||||
python3 && \
|
||||
python && \
|
||||
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-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic 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-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/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 && \
|
||||
|
||||
@@ -5,7 +5,7 @@ ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG QBITTORRENT_VERSION
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="sparklyballs, thelamer"
|
||||
LABEL maintainer="thelamer"
|
||||
|
||||
# environment settings
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
@@ -19,16 +19,15 @@ RUN \
|
||||
apt-get update && \
|
||||
apt-get install -y \
|
||||
gnupg \
|
||||
python \
|
||||
python3 && \
|
||||
python && \
|
||||
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-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu bionic main" >> /etc/apt/sources.list.d/qbitorrent.list && \
|
||||
echo "deb https://dl.bintray.com/fedarovich/qbittorrent-cli-debian bionic 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-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
|
||||
QBITTORRENT_VERSION=$(curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/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 && \
|
||||
|
||||
80
Jenkinsfile
vendored
80
Jenkinsfile
vendored
@@ -41,7 +41,7 @@ pipeline {
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
script: '''docker run --rm 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 alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':unstable 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
returnStdout: true).trim()
|
||||
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' ''',
|
||||
@@ -103,7 +103,7 @@ pipeline {
|
||||
steps{
|
||||
script{
|
||||
env.EXT_RELEASE = sh(
|
||||
script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
|
||||
script: ''' curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}' ''',
|
||||
returnStdout: true).trim()
|
||||
env.RELEASE_LINK = 'custom_command'
|
||||
}
|
||||
@@ -119,10 +119,10 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
// If this is a master build use live docker endpoints
|
||||
// If this is a unstable build use live docker endpoints
|
||||
stage("Set ENV live build"){
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -143,7 +143,7 @@ pipeline {
|
||||
// If this is a dev build use dev docker endpoints
|
||||
stage("Set ENV dev build"){
|
||||
when {
|
||||
not {branch "master"}
|
||||
not {branch "unstable"}
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -216,7 +216,7 @@ pipeline {
|
||||
// Use helper containers to render templated files
|
||||
stage('Update-Templates') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
expression {
|
||||
env.CONTAINER_NAME != null
|
||||
@@ -227,7 +227,7 @@ pipeline {
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
docker pull linuxserver/jenkins-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
|
||||
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=unstable -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
|
||||
CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
|
||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
|
||||
@@ -235,7 +235,7 @@ pipeline {
|
||||
mkdir -p ${TEMPDIR}/repo
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||
git checkout -f master
|
||||
git checkout -f unstable
|
||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
|
||||
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
|
||||
@@ -267,7 +267,7 @@ pipeline {
|
||||
// Exit the build if the Templated files were just updated
|
||||
stage('Template-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'FILES_UPDATED', value: 'true'
|
||||
expression {
|
||||
@@ -386,7 +386,7 @@ pipeline {
|
||||
// Take the image we just built and dump package versions for comparison
|
||||
stage('Update-packages') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
@@ -414,7 +414,7 @@ pipeline {
|
||||
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
|
||||
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 unstable
|
||||
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
|
||||
cd ${TEMPDIR}/${LS_REPO}/
|
||||
wait
|
||||
@@ -438,7 +438,7 @@ pipeline {
|
||||
// Exit the build if the package file was just updated
|
||||
stage('PACKAGE-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'PACKAGE_UPDATED', value: 'true'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
@@ -452,7 +452,7 @@ pipeline {
|
||||
// Exit the build if this is just a package check and there are no changes to push
|
||||
stage('PACKAGECHECK-exit') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'PACKAGE_UPDATED', value: 'false'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
@@ -547,14 +547,14 @@ pipeline {
|
||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
|
||||
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
|
||||
docker push ${PUSHIMAGE}:latest
|
||||
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:unstable
|
||||
docker push ${PUSHIMAGE}:unstable
|
||||
docker push ${PUSHIMAGE}:${META_TAG}
|
||||
done
|
||||
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:${META_TAG} \
|
||||
${DELETEIMAGE}:latest || :
|
||||
${DELETEIMAGE}:unstable || :
|
||||
done
|
||||
'''
|
||||
}
|
||||
@@ -597,52 +597,52 @@ pipeline {
|
||||
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-unstable
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-unstable
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-unstable
|
||||
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 manifest push --purge ${MANIFESTIMAGE}:latest || :
|
||||
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
|
||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
|
||||
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
|
||||
docker push ${MANIFESTIMAGE}:amd64-unstable
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-unstable
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-unstable
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:unstable || :
|
||||
docker manifest create ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:amd64-unstable ${MANIFESTIMAGE}:arm32v7-unstable ${MANIFESTIMAGE}:arm64v8-unstable
|
||||
docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm32v7-unstable --os linux --arch arm
|
||||
docker manifest annotate ${MANIFESTIMAGE}:unstable ${MANIFESTIMAGE}:arm64v8-unstable --os linux --arch arm64 --variant v8
|
||||
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 annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:latest
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:unstable
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||
done
|
||||
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
|
||||
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:unstable
|
||||
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
|
||||
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
|
||||
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
|
||||
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-unstable
|
||||
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-unstable
|
||||
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:latest
|
||||
docker push ${LEGACYIMAGE}:unstable
|
||||
docker push ${LEGACYIMAGE}:${META_TAG}
|
||||
docker push ${LEGACYIMAGE}:arm32v7-latest
|
||||
docker push ${LEGACYIMAGE}:arm64v8-latest
|
||||
docker push ${LEGACYIMAGE}:arm32v7-unstable
|
||||
docker push ${LEGACYIMAGE}:arm64v8-unstable
|
||||
done
|
||||
'''
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
||||
${DELETEIMAGE}:amd64-latest \
|
||||
${DELETEIMAGE}:amd64-unstable \
|
||||
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
||||
${DELETEIMAGE}:arm32v7-latest \
|
||||
${DELETEIMAGE}:arm32v7-unstable \
|
||||
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
||||
${DELETEIMAGE}:arm64v8-latest || :
|
||||
${DELETEIMAGE}:arm64v8-unstable || :
|
||||
done
|
||||
docker rmi \
|
||||
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
||||
@@ -654,7 +654,7 @@ pipeline {
|
||||
// If this is a public release tag it in the LS Github
|
||||
stage('Github-Tag-Push-Release') {
|
||||
when {
|
||||
branch "master"
|
||||
branch "unstable"
|
||||
expression {
|
||||
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
}
|
||||
@@ -666,17 +666,17 @@ pipeline {
|
||||
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
|
||||
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"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 unstable",\
|
||||
"type": "commit",\
|
||||
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
|
||||
echo "Pushing New release for Tag"
|
||||
sh '''#! /bin/bash
|
||||
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
|
||||
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"target_commitish": "master",\
|
||||
"target_commitish": "unstable",\
|
||||
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
|
||||
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\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
|
||||
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
|
||||
}
|
||||
|
||||
11
README.md
11
README.md
@@ -7,7 +7,7 @@
|
||||
[](https://github.com/linuxserver "view the source for all of our repositories.")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
|
||||
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
|
||||
* easy user mappings (PGID, PUID)
|
||||
@@ -93,7 +93,7 @@ Compatible with docker-compose v2 schemas.
|
||||
|
||||
```
|
||||
---
|
||||
version: "2.1"
|
||||
version: "2"
|
||||
services:
|
||||
qbittorrent:
|
||||
image: linuxserver/qbittorrent
|
||||
@@ -184,11 +184,6 @@ WebUI\ServerDomains=*
|
||||
```
|
||||
|
||||
|
||||
## Docker Mods
|
||||
[](https://mods.linuxserver.io/?mod=qbittorrent "view available mods for this container.")
|
||||
|
||||
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) can be accessed via the dynamic badge above.
|
||||
|
||||
|
||||
## Support Info
|
||||
|
||||
@@ -254,7 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **03.04.20:** - Fix adding search engine plugin
|
||||
* **31.10.19:** - Adding unstable tag.
|
||||
* **02.08.19:** - Add qbitorrent-cli for processing scripts.
|
||||
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
|
||||
* **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
# jenkins variables
|
||||
project_name: docker-qbittorrent
|
||||
external_type: na
|
||||
custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
|
||||
release_type: stable
|
||||
release_tag: latest
|
||||
ls_branch: master
|
||||
custom_version_command: "curl -sX GET http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: qbittorrent-nox' | awk -F ': ' '/Version/{print $2;exit}'"
|
||||
release_type: prerelease
|
||||
release_tag: unstable
|
||||
ls_branch: unstable
|
||||
repo_vars:
|
||||
- CONTAINER_NAME = 'qbittorrent'
|
||||
- BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
adduser3.116ubuntu1
|
||||
apt1.6.12
|
||||
apt-utils1.6.12
|
||||
base-files10.1ubuntu2.8
|
||||
base-files10.1ubuntu2.7
|
||||
base-passwd3.5.44
|
||||
bash4.4.18-2ubuntu1.2
|
||||
bsdutils1:2.31.1-0.4ubuntu3.6
|
||||
bsdutils1:2.31.1-0.4ubuntu3.4
|
||||
bzip21.0.6-8.1ubuntu0.2
|
||||
ca-certificates20180409
|
||||
coreutils8.28-1ubuntu1
|
||||
@@ -16,11 +16,11 @@ debianutils4.8.4
|
||||
diffutils1:3.6-1
|
||||
dirmngr2.2.4-1ubuntu1.2
|
||||
dpkg1.19.0.5ubuntu2.3
|
||||
e2fsprogs1.44.1-1ubuntu1.3
|
||||
fdisk2.31.1-0.4ubuntu3.6
|
||||
e2fsprogs1.44.1-1ubuntu1.2
|
||||
fdisk2.31.1-0.4ubuntu3.4
|
||||
file1:5.32-2ubuntu0.3
|
||||
findutils4.6.0+git+20170828-2
|
||||
gcc-8-base8.4.0-1ubuntu1~18.04
|
||||
gcc-8-base8.3.0-6ubuntu1~18.04.1
|
||||
geoip-bin1.6.12-1
|
||||
geoip-database20180315-1
|
||||
gnupg2.2.4-1ubuntu1.2
|
||||
@@ -47,29 +47,29 @@ libassuan02.5.1-2
|
||||
libattr11:2.4.47-2build1
|
||||
libaudit11:2.8.2-1ubuntu1
|
||||
libaudit-common1:2.8.2-1ubuntu1
|
||||
libblkid12.31.1-0.4ubuntu3.6
|
||||
libblkid12.31.1-0.4ubuntu3.4
|
||||
libboost-system1.65.11.65.1+dfsg-0ubuntu5
|
||||
libbz2-1.01.0.6-8.1ubuntu0.2
|
||||
libc62.27-3ubuntu1
|
||||
libcap-ng00.7.7-3.1
|
||||
libc-bin2.27-3ubuntu1
|
||||
libcom-err21.44.1-1ubuntu1.3
|
||||
libcom-err21.44.1-1ubuntu1.2
|
||||
libcurl47.58.0-2ubuntu3.8
|
||||
libdb5.35.3.28-13.1ubuntu1.1
|
||||
libdbus-1-31.12.2-1ubuntu1.1
|
||||
libdebconfclient00.213ubuntu1
|
||||
libdouble-conversion12.0.1-4ubuntu1
|
||||
libexpat12.2.5-3ubuntu0.2
|
||||
libext2fs21.44.1-1ubuntu1.3
|
||||
libfdisk12.31.1-0.4ubuntu3.6
|
||||
libext2fs21.44.1-1ubuntu1.2
|
||||
libfdisk12.31.1-0.4ubuntu3.4
|
||||
libffi63.2.1-8
|
||||
libgcc11:8.4.0-1ubuntu1~18.04
|
||||
libgcrypt201.8.1-4ubuntu1.2
|
||||
libgcc11:8.3.0-6ubuntu1~18.04.1
|
||||
libgcrypt201.8.1-4ubuntu1.1
|
||||
libgeoip11.6.12-1
|
||||
libglib2.0-02.56.4-0ubuntu0.18.04.6
|
||||
libglib2.0-data2.56.4-0ubuntu0.18.04.6
|
||||
libglib2.0-02.56.4-0ubuntu0.18.04.4
|
||||
libglib2.0-data2.56.4-0ubuntu0.18.04.4
|
||||
libgmp102:6.1.2+dfsg-2
|
||||
libgnutls303.5.18-1ubuntu1.3
|
||||
libgnutls303.5.18-1ubuntu1.1
|
||||
libgpg-error01.27-6
|
||||
libgssapi3-heimdal7.5.0+dfsg-1
|
||||
libgssapi-krb5-21.16-2ubuntu0.1
|
||||
@@ -78,7 +78,7 @@ libheimbase1-heimdal7.5.0+dfsg-1
|
||||
libheimntlm0-heimdal7.5.0+dfsg-1
|
||||
libhogweed43.4-1
|
||||
libhx509-5-heimdal7.5.0+dfsg-1
|
||||
libicu6060.2-3ubuntu3.1
|
||||
libicu6060.2-3ubuntu3
|
||||
libidn2-02.0.4-1.1ubuntu0.2
|
||||
libk5crypto31.16-2ubuntu0.1
|
||||
libkeyutils11.5.9-9.2ubuntu2
|
||||
@@ -92,8 +92,7 @@ liblz4-10.0~r131-2ubuntu3
|
||||
liblzma55.2.2-1.3
|
||||
libmagic11:5.32-2ubuntu0.3
|
||||
libmagic-mgc1:5.32-2ubuntu0.3
|
||||
libmount12.31.1-0.4ubuntu3.6
|
||||
libmpdec22.4.2-1ubuntu1
|
||||
libmount12.31.1-0.4ubuntu3.4
|
||||
libncurses56.1-1ubuntu1.18.04
|
||||
libncursesw56.1-1ubuntu1.18.04
|
||||
libnettle63.4-1
|
||||
@@ -107,49 +106,46 @@ libpam-runtime1.1.8-3.6ubuntu2.18.04.1
|
||||
libpcre32:8.39-9
|
||||
libprocps62:3.3.12-3ubuntu1.2
|
||||
libpsl50.19.1-5build1
|
||||
libpython2.7-minimal2.7.17-1~18.04
|
||||
libpython2.7-stdlib2.7.17-1~18.04
|
||||
libpython3.6-minimal3.6.9-1~18.04
|
||||
libpython3.6-stdlib3.6.9-1~18.04
|
||||
libpython3-stdlib3.6.7-1~18.04
|
||||
libpython2.7-minimal2.7.15-4ubuntu4~18.04.2
|
||||
libpython2.7-stdlib2.7.15-4ubuntu4~18.04.2
|
||||
libpython-stdlib2.7.15~rc1-1
|
||||
libqt5core5a5.9.5+dfsg-0ubuntu2.5
|
||||
libqt5dbus55.9.5+dfsg-0ubuntu2.5
|
||||
libqt5network55.9.5+dfsg-0ubuntu2.5
|
||||
libqt5xml55.9.5+dfsg-0ubuntu2.5
|
||||
libqt5core5a5.9.5+dfsg-0ubuntu2.4
|
||||
libqt5dbus55.9.5+dfsg-0ubuntu2.4
|
||||
libqt5network55.9.5+dfsg-0ubuntu2.4
|
||||
libqt5xml55.9.5+dfsg-0ubuntu2.4
|
||||
libreadline77.0-3
|
||||
libroken18-heimdal7.5.0+dfsg-1
|
||||
librtmp12.4+20151223.gitfa8646d.1-1
|
||||
libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
|
||||
libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
|
||||
libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
|
||||
libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2
|
||||
libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2
|
||||
libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2
|
||||
libseccomp22.4.1-0ubuntu0.18.04.2
|
||||
libselinux12.7-2build2
|
||||
libsemanage12.7-2build2
|
||||
libsemanage-common2.7-2build2
|
||||
libsepol12.7-1
|
||||
libsmartcols12.31.1-0.4ubuntu3.6
|
||||
libsqlite3-03.22.0-1ubuntu0.3
|
||||
libss21.44.1-1ubuntu1.3
|
||||
libsmartcols12.31.1-0.4ubuntu3.4
|
||||
libsqlite3-03.22.0-1ubuntu0.2
|
||||
libss21.44.1-1ubuntu1.2
|
||||
libssl1.0.01.0.2n-1ubuntu5.3
|
||||
libssl1.11.1.1-1ubuntu2.1~18.04.5
|
||||
libstdc++68.4.0-1ubuntu1~18.04
|
||||
libsystemd0237-3ubuntu10.39
|
||||
libstdc++68.3.0-6ubuntu1~18.04.1
|
||||
libsystemd0237-3ubuntu10.33
|
||||
libtasn1-64.13-2
|
||||
libtinfo56.1-1ubuntu1.18.04
|
||||
libtorrent-rasterbar101.2.5+git20200401.dcf3c83d29-1ppa1~18.04
|
||||
libudev1237-3ubuntu10.39
|
||||
libtorrent-rasterbar101.2.2+git20191202.7b0bb2fb0b-1ppa1~18.04
|
||||
libudev1237-3ubuntu10.33
|
||||
libunistring20.9.9-0ubuntu2
|
||||
libuuid12.31.1-0.4ubuntu3.6
|
||||
libuuid12.31.1-0.4ubuntu3.4
|
||||
libwind0-heimdal7.5.0+dfsg-1
|
||||
libxml22.9.4+dfsg1-6.1ubuntu1.3
|
||||
libxml22.9.4+dfsg1-6.1ubuntu1.2
|
||||
libzstd11.3.3+dfsg-2ubuntu1.1
|
||||
locales2.27-3ubuntu1
|
||||
login1:4.5-1ubuntu2
|
||||
lsb-base9.20170808ubuntu1
|
||||
mawk1.3.3-17ubuntu3
|
||||
mime-support3.60ubuntu1
|
||||
mount2.31.1-0.4ubuntu3.6
|
||||
mount2.31.1-0.4ubuntu3.4
|
||||
ncurses-base6.1-1ubuntu1.18.04
|
||||
ncurses-bin6.1-1ubuntu1.18.04
|
||||
openssl1.1.1-1ubuntu2.1~18.04.5
|
||||
@@ -161,15 +157,11 @@ pinentry-curses1.1.0-1
|
||||
procps2:3.3.12-3ubuntu1.2
|
||||
publicsuffix20180223.1310-1
|
||||
python2.7.15~rc1-1
|
||||
python2.72.7.17-1~18.04
|
||||
python2.7-minimal2.7.17-1~18.04
|
||||
python33.6.7-1~18.04
|
||||
python3.63.6.9-1~18.04
|
||||
python3.6-minimal3.6.9-1~18.04
|
||||
python3-minimal3.6.7-1~18.04
|
||||
python2.72.7.15-4ubuntu4~18.04.2
|
||||
python2.7-minimal2.7.15-4ubuntu4~18.04.2
|
||||
python-minimal2.7.15~rc1-1
|
||||
qbittorrent-cli1.5.19350-1
|
||||
qbittorrent-nox1:4.2.3.99~202004021627-6962-29e9594~ubuntu18.04.1
|
||||
qbittorrent-cli1.5.19322-1
|
||||
qbittorrent-nox4.3.0~201912060947-6799-d051519~ubuntu18.04.1
|
||||
qttranslations5-l10n5.9.5-0ubuntu1
|
||||
readline-common7.0-3
|
||||
sed4.4-2
|
||||
@@ -181,7 +173,7 @@ tzdata2019c-0ubuntu0.18.04
|
||||
ubuntu-keyring2018.09.18.1~18.04.0
|
||||
unrar1:5.5.8-1
|
||||
unzip6.0-21ubuntu1
|
||||
util-linux2.31.1-0.4ubuntu3.6
|
||||
util-linux2.31.1-0.4ubuntu3.4
|
||||
xdg-user-dirs0.17-1ubuntu1
|
||||
xz-utils5.2.2-1.3
|
||||
zlib1g1:1.2.11.dfsg-0ubuntu2
|
||||
|
||||
@@ -69,7 +69,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "03.04.20:", desc: "Fix adding search engine plugin" }
|
||||
- { date: "31.10.19:", desc: "Adding unstable tag." }
|
||||
- { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }
|
||||
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
|
||||
- { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
|
||||
|
||||
Reference in New Issue
Block a user