Compare commits

..

82 Commits

Author SHA1 Message Date
LinuxServer-CI
dc0f91c473 Bot Updating Package Versions 2020-03-23 20:10:23 +01:00
LinuxServer-CI
d28675bbf6 Bot Updating Package Versions 2020-03-22 11:08:10 -04:00
LinuxServer-CI
111caa6a1f Bot Updating Package Versions 2020-03-21 08:19:55 +00:00
LinuxServer-CI
69f2f66043 Bot Updating Package Versions 2020-03-19 11:08:15 +00:00
LinuxServer-CI
fd812496bc Bot Updating Package Versions 2020-03-17 07:08:09 +00:00
LinuxServer-CI
c5612f816e Bot Updating Package Versions 2020-03-13 16:43:50 -04:00
LinuxServer-CI
8607efc1fe Bot Updating Package Versions 2020-03-10 11:08:12 +00:00
LinuxServer-CI
88af8b5693 Bot Updating Package Versions 2020-03-09 07:13:53 -04:00
LinuxServer-CI
f514a71654 Bot Updating Package Versions 2020-03-08 07:19:15 -04:00
LinuxServer-CI
4ea94c9d1f Bot Updating Package Versions 2020-03-07 11:11:04 +00:00
LinuxServer-CI
c604390868 Bot Updating Package Versions 2020-03-06 11:13:30 +00:00
LinuxServer-CI
838278894d Bot Updating Package Versions 2020-03-04 20:08:08 +00:00
LinuxServer-CI
68bb38cc68 Bot Updating Package Versions 2020-03-03 19:10:17 +00:00
LinuxServer-CI
04f35bbc4d Bot Updating Package Versions 2020-03-01 20:13:00 +00:00
LinuxServer-CI
b3b097ebdc Bot Updating Package Versions 2020-02-28 07:18:34 -05:00
LinuxServer-CI
557b443175 Bot Updating Package Versions 2020-02-27 12:13:15 +00:00
LinuxServer-CI
49376cb514 Bot Updating Package Versions 2020-02-25 10:12:08 +00:00
LinuxServer-CI
15d7379386 Bot Updating Package Versions 2020-02-24 08:12:46 +00:00
LinuxServer-CI
2656893674 Bot Updating Package Versions 2020-02-22 07:08:43 -05:00
LinuxServer-CI
a5af0b35b7 Bot Updating Package Versions 2020-02-21 07:14:39 -05:00
LinuxServer-CI
b50b3d2897 Bot Updating Package Versions 2020-02-19 11:10:47 +00:00
LinuxServer-CI
a8c929c4fe Bot Updating Package Versions 2020-02-18 11:15:01 +00:00
LinuxServer-CI
e53c5dd330 Bot Updating Package Versions 2020-02-17 06:09:09 -05:00
LinuxServer-CI
49b3a91ab0 Bot Updating Package Versions 2020-02-16 05:14:22 -05:00
LinuxServer-CI
cf2e5b4ab0 Bot Updating Package Versions 2020-02-14 05:08:57 -05:00
LinuxServer-CI
f12ca4a394 Bot Updating Package Versions 2020-02-13 05:08:22 -05:00
LinuxServer-CI
57646b7af5 Bot Updating Package Versions 2020-02-12 10:12:52 +00:00
LinuxServer-CI
f6e5aa9f1e Bot Updating Package Versions 2020-02-11 10:09:23 +00:00
LinuxServer-CI
5c01f3dd4f Bot Updating Package Versions 2020-02-08 19:08:55 +00:00
LinuxServer-CI
1ab20ab07e Bot Updating Package Versions 2020-02-07 06:10:59 -05:00
LinuxServer-CI
71c9d26288 Bot Updating Package Versions 2020-01-31 19:14:05 +00:00
LinuxServer-CI
b027f732cd Bot Updating Package Versions 2020-01-30 12:10:30 +00:00
LinuxServer-CI
136bfc0cc5 Bot Updating Package Versions 2020-01-28 19:08:29 -05:00
LinuxServer-CI
f0658171c5 Bot Updating Package Versions 2020-01-24 20:12:48 +01:00
LinuxServer-CI
d9ff314a4c Bot Updating Package Versions 2020-01-22 06:08:58 +00:00
LinuxServer-CI
48695f300e Bot Updating Package Versions 2020-01-20 01:13:28 -05:00
LinuxServer-CI
156684155f Bot Updating Package Versions 2020-01-17 07:10:37 -05:00
LinuxServer-CI
8cb1690973 Bot Updating Package Versions 2020-01-16 06:09:28 +00:00
LinuxServer-CI
e90c67b867 Bot Updating Package Versions 2020-01-14 11:10:31 +00:00
LinuxServer-CI
5291380ad2 Bot Updating Package Versions 2020-01-13 01:13:18 -05:00
LinuxServer-CI
55acda7d6c Bot Updating Package Versions 2020-01-12 05:54:07 +00:00
LinuxServer-CI
ac6e13960e Bot Updating Package Versions 2020-01-11 00:12:38 -05:00
LinuxServer-CI
fa775fbd67 Bot Updating Package Versions 2020-01-09 06:08:34 +00:00
LinuxServer-CI
4068b58145 Bot Updating Package Versions 2020-01-08 01:10:34 -05:00
LinuxServer-CI
6bd6406f99 Bot Updating Package Versions 2020-01-06 19:09:42 -05:00
LinuxServer-CI
6be6f5e72b Bot Updating Package Versions 2020-01-02 13:11:44 -05:00
LinuxServer-CI
345081f5d9 Bot Updating Package Versions 2019-12-28 13:12:39 -05:00
LinuxServer-CI
89a246f79f Bot Updating Package Versions 2019-12-27 22:08:18 +00:00
LinuxServer-CI
f6f793f551 Bot Updating Package Versions 2019-12-26 17:12:04 +00:00
LinuxServer-CI
60e14150ca Bot Updating Package Versions 2019-12-25 22:12:03 -05:00
LinuxServer-CI
db0de95ceb Bot Updating Package Versions 2019-12-24 12:09:36 -05:00
LinuxServer-CI
b8711fd5bb Bot Updating Package Versions 2019-12-23 18:10:19 +00:00
LinuxServer-CI
22df5852db Bot Updating Package Versions 2019-12-20 00:12:50 -05:00
LinuxServer-CI
cd897f4a50 Bot Updating Package Versions 2019-12-19 08:46:39 +00:00
LinuxServer-CI
c1a23eda66 Bot Updating Package Versions 2019-12-17 05:12:10 +00:00
LinuxServer-CI
0d2c39dd04 Bot Updating Package Versions 2019-12-13 11:09:56 +00:00
LinuxServer-CI
9d3259cbdf Bot Updating Package Versions 2019-12-12 12:10:04 +01:00
LinuxServer-CI
034e9f1d68 Bot Updating Package Versions 2019-12-11 11:10:13 +00:00
LinuxServer-CI
924b3a2402 Bot Updating Package Versions 2019-12-10 06:10:36 -05:00
LinuxServer-CI
c53014eac3 Bot Updating Package Versions 2019-12-08 19:20:11 +00:00
LinuxServer-CI
0613934e6b Bot Updating Package Versions 2019-12-06 06:10:37 -05:00
LinuxServer-CI
40d19347c3 Bot Updating Package Versions 2019-12-05 10:12:20 +00:00
LinuxServer-CI
47d58f9e4d Bot Updating Package Versions 2019-12-04 05:11:41 -05:00
LinuxServer-CI
ece00294b1 Bot Updating Package Versions 2019-12-03 08:08:34 -05:00
LinuxServer-CI
5c8677d600 Bot Updating Package Versions 2019-12-02 05:15:18 -05:00
LinuxServer-CI
788d8fb753 Bot Updating Package Versions 2019-11-30 05:10:01 +01:00
LinuxServer-CI
c7e7c1c222 Bot Updating Package Versions 2019-11-27 17:19:39 -05:00
LinuxServer-CI
634fcd0f7d Bot Updating Templated Files 2019-11-27 17:05:09 -05:00
LinuxServer-CI
8f0acdeb52 Bot Updating Package Versions 2019-11-23 10:10:17 +00:00
LinuxServer-CI
e7f77f2ffc Bot Updating Package Versions 2019-11-21 17:08:14 -05:00
LinuxServer-CI
44fe098e99 Bot Updating Package Versions 2019-11-20 23:15:21 +01:00
LinuxServer-CI
9a220e3eee Bot Updating Package Versions 2019-11-18 16:09:38 -05:00
LinuxServer-CI
ad31b8c925 Bot Updating Package Versions 2019-11-15 08:12:27 +00:00
LinuxServer-CI
cb7a875129 Bot Updating Package Versions 2019-11-14 08:09:02 +00:00
LinuxServer-CI
cc700c5af2 Bot Updating Package Versions 2019-11-13 02:49:18 +01:00
LinuxServer-CI
fa140d452d Bot Updating Package Versions 2019-11-12 03:08:33 +00:00
LinuxServer-CI
02fe01a63a Bot Updating Package Versions 2019-11-11 02:09:05 +01:00
LinuxServer-CI
d9b8488135 Bot Updating Package Versions 2019-11-09 08:08:54 +00:00
LinuxServer-CI
20b308df2c Bot Updating Package Versions 2019-11-05 03:13:46 -05:00
LinuxServer-CI
419f0ae428 Bot Updating Package Versions 2019-11-04 20:12:38 +00:00
j0nnymoe
8766fd9a5c #55 adding unstable tag (#57)
#55 adding unstable tag
2019-11-04 20:08:01 +00:00
thelamer
60da66b714 adding unstable logic 2019-10-31 13:59:24 -07:00
8 changed files with 62 additions and 61 deletions

View File

@@ -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"
@@ -22,12 +22,12 @@ RUN \
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 && \

View File

@@ -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"
@@ -22,12 +22,12 @@ RUN \
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 && \

View File

@@ -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"
@@ -22,12 +22,12 @@ RUN \
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
View File

@@ -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'''
}

View File

@@ -131,7 +131,6 @@ Container images are configured using parameters passed at runtime (such as thos
| `-v /config` | Contains all relevant configuration files. |
| `-v /downloads` | Location of downloads on disk. |
## Environment variables from files (Docker secrets)
You can set any environment variable from a file by using a special prepend `FILE__`.
@@ -250,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **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.

View File

@@ -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'

View File

@@ -20,7 +20,7 @@ e2fsprogs1.44.1-1ubuntu1.3
fdisk2.31.1-0.4ubuntu3.5
file1:5.32-2ubuntu0.3
findutils4.6.0+git+20170828-2
gcc-8-base8.3.0-6ubuntu1~18.04.1
gcc-8-base8.3.0-26ubuntu1~18.04
geoip-bin1.6.12-1
geoip-database20180315-1
gnupg2.2.4-1ubuntu1.2
@@ -63,7 +63,7 @@ libexpat12.2.5-3ubuntu0.2
libext2fs21.44.1-1ubuntu1.3
libfdisk12.31.1-0.4ubuntu3.5
libffi63.2.1-8
libgcc11:8.3.0-6ubuntu1~18.04.1
libgcc11:8.3.0-26ubuntu1~18.04
libgcrypt201.8.1-4ubuntu1.2
libgeoip11.6.12-1
libglib2.0-02.56.4-0ubuntu0.18.04.4
@@ -129,7 +129,7 @@ libsqlite3-03.22.0-1ubuntu0.3
libss21.44.1-1ubuntu1.3
libssl1.0.01.0.2n-1ubuntu5.3
libssl1.11.1.1-1ubuntu2.1~18.04.5
libstdc++68.3.0-6ubuntu1~18.04.1
libstdc++68.3.0-26ubuntu1~18.04
libsystemd0237-3ubuntu10.39
libtasn1-64.13-2
libtinfo56.1-1ubuntu1.18.04
@@ -161,7 +161,7 @@ python2.72.7.17-1~18.04
python2.7-minimal2.7.17-1~18.04
python-minimal2.7.15~rc1-1
qbittorrent-cli1.5.19350-1
qbittorrent-nox1:4.2.0.99~201912180418-6819-118af03~ubuntu18.04.1
qbittorrent-nox4.3.0~202003231504-6896-fbf325c~ubuntu18.04.1
qttranslations5-l10n5.9.5-0ubuntu1
readline-common7.0-3
sed4.4-2

View File

@@ -69,6 +69,7 @@ app_setup_block: |
# changelog
changelogs:
- { 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." }