Bot Updating Package Versions

Pipeline, rebase to Ubuntu, and multi arch build

Dockerfile

@@ -1,91 +1,51 @@
-FROM lsiobase/alpine:3.6
-MAINTAINER sparklyballs
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG QBITTORRENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs, thelamer"
 
-# package versions
-ARG QBITTORRENT_VER="3.3.14"
-ARG RASTERBAR_VER="RC_1_0"
-
-# environment settings
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
 
-# copy patches
-COPY patches/ /tmp/patches
-
-# install build packages
+# add repo and install qbitorrent
 RUN \
- apk add --no-cache --virtual=build-dependencies \
-	autoconf \
-	automake \
-	boost-dev \
-	cmake \
-	curl \
-	file \
-	g++ \
-	geoip-dev \
-	git \
-	libtool \
-	make \
-	qt5-qttools-dev && \
-
-# install runtime packages
- apk add --no-cache \
-	boost-system \
-	boost-thread \
-	ca-certificates \
-	geoip \
-	qt5-qtbase \
-	unrar && \
-
-# compile libtorrent rasterbar
- git clone https://github.com/arvidn/libtorrent.git /tmp/libtorrent && \
- cd /tmp/libtorrent && \
- git checkout ${RASTERBAR_VER} && \
- ./autotool.sh && \
- ./configure \
-	--disable-debug \
-	--enable-encryption \
-	--prefix=/usr \
-	--with-libgeoip=system && \
- make && \
- make install && \
- strip --strip-unneeded \
-	/usr/lib/libtorrent-rasterbar.so* \
-	/usr/lib/libtorrent-rasterbar.a* && \
-
-# compile qbittorrent
- mkdir -p \
-	/tmp/qbittorrent-src && \
- curl -o \
- /tmp/bittorrent.tar.gz -L \
-	"https://github.com/qbittorrent/qBittorrent/archive/release-${QBITTORRENT_VER}.tar.gz" && \
- tar xf \
- /tmp/bittorrent.tar.gz -C \
-	/tmp/qbittorrent-src --strip-components=1 && \
- cd /tmp/qbittorrent-src/src/app && \
- patch -i /tmp/patches/main.patch && \
- cd /tmp/qbittorrent-src && \
- ./configure \
-	--disable-gui \
-	--prefix=/usr && \
- make && \
- make install && \
-
-# cleanup
- apk del --purge \
-	build-dependencies && \
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ 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 "**** 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 \
+	|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-nox=${QBITTORRENT_VERSION} \
+	unrar \
+	geoip-bin \
+	unzip && \
+ echo "**** cleanup ****" && \
+ apt-get clean && \
  rm -rf \
-	/tmp/*
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
-# add local files
+# add local files
 COPY root/ /
 
+
 # ports and volumes
 EXPOSE 6881 6881/udp 8080
 VOLUME /config /downloads

Dockerfile.aarch64

@@ -0,0 +1,54 @@
+FROM lsiobase/ubuntu.arm64:bionic
+
+# Add qemu to build on x86_64 systems
+COPY qemu-aarch64-static /usr/bin
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG QBITTORRENT_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs, thelamer"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/config" \
+XDG_CONFIG_HOME="/config" \
+XDG_DATA_HOME="/config"
+
+# add repo and install qbitorrent
+RUN \
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ 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 "**** 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 \
+	|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-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

Dockerfile.armhf

@@ -0,0 +1,54 @@
+FROM lsiobase/ubuntu.armhf:bionic
+
+# Add qemu to build on x86_64 systems
+COPY qemu-arm-static /usr/bin
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG QBITTORRENT_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs, thelamer"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/config" \
+XDG_CONFIG_HOME="/config" \
+XDG_DATA_HOME="/config"
+
+# add repo and install qbitorrent
+RUN \
+ echo "***** add qbitorrent repositories ****" && \
+ apt-get update && \
+ apt-get install -y \
+	gnupg \
+	python && \
+ 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 "**** 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 \
+	|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-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

Jenkinsfile

@@ -0,0 +1,593 @@
+pipeline {
+  agent {
+    label 'X86-64-MULTI'
+  }
+  // Input to determine if this is a package check
+  parameters {
+     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+  }
+  // Configuration for the variables used for this specific repo
+  environment {
+    BUILDS_DISCORD=credentials('build_webhook_url')
+    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
+    CONTAINER_NAME = 'qbittorrent'
+    BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
+    LS_USER = 'linuxserver'
+    LS_REPO = 'docker-qbittorrent'
+    DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
+    DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
+    PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
+    DIST_IMAGE = 'ubuntu'
+    MULTIARCH='true'
+    CI='true'
+    CI_WEB='true'
+    CI_PORT='8080'
+    CI_SSL='false'
+    CI_DELAY='120'
+    CI_DOCKERENV='TZ=US/Pacific'
+    CI_AUTH='user:password'
+    CI_WEBPATH=''
+  }
+  stages {
+    // Setup all the basic environment variables needed for the build
+    stage("Set ENV Variables base"){
+      steps{
+        script{
+          env.EXIT_STATUS = ''
+          env.LS_RELEASE = sh(
+            script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
+            returnStdout: true).trim()
+          env.LS_RELEASE_NOTES = sh(
+            script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
+            returnStdout: true).trim()
+          env.GITHUB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
+          env.COMMIT_SHA = sh(
+            script: '''git rev-parse HEAD''',
+            returnStdout: true).trim()
+          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
+        }
+        script{
+          env.LS_RELEASE_NUMBER = sh(
+            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
+            returnStdout: true).trim()
+        }
+        script{
+          env.LS_TAG_NUMBER = sh(
+            script: '''#! /bin/bash
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
+                         echo ${LS_RELEASE_NUMBER}
+                       elif [ -z "${GIT_COMMIT}" ]; then
+                         echo ${LS_RELEASE_NUMBER}
+                       else
+                         echo $((${LS_RELEASE_NUMBER} + 1))
+                       fi''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    /* #######################
+       Package Version Tagging
+       ####################### */
+    // Grab the current package versions in Git to determine package tag
+    stage("Set Package tag"){
+      steps{
+        script{
+          env.PACKAGE_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e package_versions.txt ] ; then
+                         cat package_versions.txt | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    /* ########################
+       External Release Tagging
+       ######################## */
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
+      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}' ''',
+            returnStdout: true).trim()
+            env.RELEASE_LINK = 'custom_command'
+        }
+      }
+    }
+    // Sanitize the release tag and strip illegal docker or github characters
+    stage("Sanitize tag"){
+      steps{
+        script{
+          env.EXT_RELEASE_CLEAN = sh(
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // If this is a master build use live docker endpoints
+    stage("Set ENV live build"){
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+      }
+      steps {
+        script{
+          env.IMAGE = env.DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+        }
+      }
+    }
+    // If this is a dev build use dev docker endpoints
+    stage("Set ENV dev build"){
+      when {
+        not {branch "master"}
+        environment name: 'CHANGE_ID', value: ''
+      }
+      steps {
+        script{
+          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
+        }
+      }
+    }
+    // If this is a pull request build use dev docker endpoints
+    stage("Set ENV PR build"){
+      when {
+        not {environment name: 'CHANGE_ID', value: ''}
+      }
+      steps {
+        script{
+          env.IMAGE = env.PR_DOCKERHUB_IMAGE
+          if (env.MULTIARCH == 'true') {
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          } else {
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          }
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
+          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+        }
+      }
+    }
+    // Use helper containers to render templated files
+    stage('Update-Templates') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        expression {
+          env.CONTAINER_NAME != null
+        }
+      }
+      steps {
+        sh '''#! /bin/bash
+              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 pull linuxserver/doc-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
+              if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
+                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                cd ${TEMPDIR}/repo/${LS_REPO}/
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              else
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.FILES_UPDATED = sh(
+            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // Exit the build if the Templated files were just updated
+    stage('Template-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'FILES_UPDATED', value: 'true'
+        expression {
+          env.CONTAINER_NAME != null
+        }
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    /* ###############
+       Build Container
+       ############### */
+    // Build Docker container for push to LS Repo
+    stage('Build-Single') {
+      when {
+        environment name: 'MULTIARCH', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
+        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+      }
+    }
+    // Build MultiArch Docker containers for push to LS Repo
+    stage('Build-Multi') {
+      when {
+        environment name: 'MULTIARCH', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      parallel {
+        stage('Build X86') {
+          steps {
+            sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+          }
+        }
+        stage('Build ARMHF') {
+          agent {
+            label 'ARMHF'
+          }
+          steps {
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
+              sh "chmod +x qemu-*"
+              sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+            }
+          }
+        }
+        stage('Build ARM64') {
+          agent {
+            label 'ARM64'
+          }
+          steps {
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+                usernameVariable: 'DOCKERUSER',
+                passwordVariable: 'DOCKERPASS'
+              ]
+            ]) {
+              echo 'Logging into DockerHub'
+              sh '''#! /bin/bash
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                 '''
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
+              sh "chmod +x qemu-*"
+              sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            }
+          }
+        }
+      }
+    }
+    // Take the image we just built and dump package versions for comparison
+    stage('Update-packages') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''#! /bin/bash
+              set -e
+              TEMPDIR=$(mktemp -d)
+              if [ "${MULTIARCH}" == "true" ]; then
+                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
+              else
+                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
+              fi
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apk info > packages && \
+                  apk info -v > versions && \
+                  paste -d " " packages versions > /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apt list -qq --installed > /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"
+              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
+                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
+                cd ${TEMPDIR}/${LS_REPO}/
+                wait
+                git add package_versions.txt
+                git commit -m 'Bot Updating Package Versions'
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Package tag updated, stopping build process"
+              else
+                echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Package tag is same as previous continue with build process"
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.PACKAGE_UPDATED = sh(
+            script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // Exit the build if the package file was just updated
+    stage('PACKAGE-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    // Exit the build if this is just a package check and there are no changes to push
+    stage('PACKAGECHECK-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+        expression {
+          params.PACKAGE_CHECK == 'true'
+        }
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    /* #######
+       Testing
+       ####### */
+    // Run Container tests
+    stage('Test') {
+      when {
+        environment name: 'CI', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          string(credentialsId: 'spaces-key', variable: 'DO_KEY'),
+          string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
+        ]) {
+          script{
+            env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+          }
+          sh '''#! /bin/bash
+                set -e
+                docker pull lsiodev/ci:latest
+                if [ "${MULTIARCH}" == "true" ]; then
+                  docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                fi
+                docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock \
+                -e IMAGE=\"${IMAGE}\" \
+                -e DELAY_START=\"${CI_DELAY}\" \
+                -e TAGS=\"${CI_TAGS}\" \
+                -e META_TAG=\"${META_TAG}\" \
+                -e PORT=\"${CI_PORT}\" \
+                -e SSL=\"${CI_SSL}\" \
+                -e BASE=\"${DIST_IMAGE}\" \
+                -e SECRET_KEY=\"${DO_SECRET}\" \
+                -e ACCESS_KEY=\"${DO_KEY}\" \
+                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
+                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
+                -e WEB_AUTH=\"${CI_AUTH}\" \
+                -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e DO_REGION="ams3" \
+                -e DO_BUCKET="lsio-ci" \
+                -t lsiodev/ci:latest \
+                python /ci/ci.py'''
+        }
+      }
+    }
+    /* ##################
+         Release Logic
+       ################## */
+    // If this is an amd64 only image only push a single image
+    stage('Docker-Push-Single') {
+      when {
+        environment name: 'MULTIARCH', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          echo 'Logging into DockerHub'
+          sh '''#! /bin/bash
+             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+             '''
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
+          sh "docker push ${IMAGE}:latest"
+          sh "docker push ${IMAGE}:${META_TAG}"
+        }
+      }
+    }
+    // If this is a multi arch release push all images and define the manifest
+    stage('Docker-Push-Multi') {
+      when {
+        environment name: 'MULTIARCH', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          sh '''#! /bin/bash
+             echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+             '''
+          sh '''#! /bin/bash
+                if [ "${CI}" == "false" ]; then
+                  docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
+                  docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
+                fi'''
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
+          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
+          sh "docker push ${IMAGE}:amd64-${META_TAG}"
+          sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
+          sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
+          sh "docker push ${IMAGE}:amd64-latest"
+          sh "docker push ${IMAGE}:arm32v6-latest"
+          sh "docker push ${IMAGE}:arm64v8-latest"
+          sh "docker manifest push --purge ${IMAGE}:latest || :"
+          sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest"
+          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
+          sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
+          sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
+          sh "docker manifest push --purge ${IMAGE}:latest"
+          sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
+        }
+      }
+    }
+    // If this is a public release tag it in the LS Github
+    stage('Github-Tag-Push-Release') {
+      when {
+        branch "master"
+        expression {
+          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
+        }
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}"
+        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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+             "object": "'${COMMIT_SHA}'",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\
+             "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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+                     "target_commitish": "master",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-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
+              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'''
+      }
+    }
+    // Use helper container to sync the current README on master to the dockerhub endpoint
+    stage('Sync-README') {
+      when {
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+            usernameVariable: 'DOCKERUSER',
+            passwordVariable: 'DOCKERPASS'
+          ]
+        ]) {
+          sh '''#! /bin/bash
+                docker pull lsiodev/readme-sync
+                docker run --rm=true \
+                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+                  -e DOCKER_REPOSITORY=${IMAGE} \
+                  -e GIT_BRANCH=master \
+                  lsiodev/readme-sync bash -c 'node sync' '''
+        }
+      }
+    }
+  }
+  /* ######################
+     Send status to Discord
+     ###################### */
+  post {
+    always {
+      script{
+        if (env.EXIT_STATUS == "ABORTED"){
+          sh 'echo "build aborted"'
+        }
+        else if (currentBuild.currentResult == "SUCCESS"){
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_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 --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_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} '''
+        }
+      }
+    }
+  }
+}

README.md

@@ -1,93 +1,177 @@
-[linuxserverurl]: https://linuxserver.io
-[forumurl]: https://forum.linuxserver.io
-[ircurl]: https://www.linuxserver.io/irc/
-[podcasturl]: https://www.linuxserver.io/podcast/
-[appurl]: https://www.qbittorrent.org
-[hub]: https://hub.docker.com/r/linuxserver/qbittorrent/
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
 
-The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
-* [forum.linuxserver.io][forumurl]
-* [IRC][ircurl] on freenode at `#linuxserver.io`
-* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
+ * regular and timely application updates
+ * easy user mappings (PGID, PUID)
+ * custom base image with s6 overlay
+ * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
+ * regular security updates
 
-# linuxserver/qbittorrent
-[![](https://images.microbadger.com/badges/version/linuxserver/qbittorrent.svg)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/qbittorrent.svg)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-qbittorrent)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-qbittorrent/)
+Find us at:
+* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
+* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
+* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
 
-The [qBittorrent][appurl] project aims to provide an open-source software alternative to µTorrent.
-qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
+# PSA: Changes are happening
 
-[![qbittorrent](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/qbittorrent-icon.png)][appurl]
+From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag.
+
+TLDR: Multi-arch support is changing from multiple repos to one repo per container image.
+
+# [linuxserver/qbittorrent](https://github.com/linuxserver/docker-qbittorrent)
+[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
+[![](https://images.microbadger.com/badges/version/linuxserver/qbittorrent.svg)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
+[![](https://images.microbadger.com/badges/image/linuxserver/qbittorrent.svg)](https://microbadger.com/images/linuxserver/qbittorrent "Get your own version badge on microbadger.com")
+![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/qbittorrent.svg)
+![Docker Stars](https://img.shields.io/docker/stars/linuxserver/qbittorrent.svg)
+
+The [Qbittorrent](https://www.qbittorrent.org/) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.
+
+[![qbittorrent](https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/qbittorrent-icon.png)](https://www.qbittorrent.org/)
+
+## Supported Architectures
+
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). 
+
+The architectures supported by this image are:
+
+| Architecture | Tag |
+| :----: | --- |
+| x86-64 | amd64-latest |
+| arm64 | arm64v8-latest |
+| armhf | arm32v6-latest |
 
 ## Usage
 
+Here are some example snippets to help you get started creating a container.
+
+### docker
+
 ```
 docker create \
   --name=qbittorrent \
-  -v <path to config>:/config \
-  -v <path to downloads>:/downloads \
-  -e PGID=<gid> -e PUID=<uid>  \
-  -e UMASK_SET=<022> \
-  -e TZ=<timezone> \
+  -e PUID=1001 \
+  -e PGID=1001 \
+  -e TZ=Europe/London \
+  -e UMASK_SET=022 \
+  -e WEBUI_PORT=8080 \
   -p 6881:6881 \
   -p 6881:6881/udp \
   -p 8080:8080 \
+  -v </path/to/appdata/config>:/config \
+  --restart unless-stopped \
   linuxserver/qbittorrent
 ```
 
+
+### docker-compose
+
+Compatible with docker-compose v2 schemas.
+
+```
+---
+version: "2"
+services:
+  qbittorrent:
+    image: linuxserver/qbittorrent
+    container_name: qbittorrent
+    environment:
+      - PUID=1001
+      - PGID=1001
+      - TZ=Europe/London
+      - UMASK_SET=022
+      - WEBUI_PORT=8080
+    volumes:
+      - </path/to/appdata/config>:/config
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - 8080:8080
+    mem_limit: 4096m
+    restart: unless-stopped
+```
+
 ## Parameters
 
-`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
-For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
-So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
-http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
+| Parameter | Function |
+| :----: | --- |
+| `-p 6881` | tcp connection port |
+| `-p 6881/udp` | udp connection port |
+| `-p 8080` | http gui |
+| `-e PUID=1001` | for UserID - see below for explanation |
+| `-e PGID=1001` | for GroupID - see below for explanation |
+| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
+| `-e UMASK_SET=022` | for umask setting of qbittorrent, optional , default if left unset is 022 |
+| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
+| `-v /config` | Contains all relevant configuration files. |
 
-* `-p 6881` - the port(s)
-* `-p 6881/udp` - the port(s)
-* `-p 8080` - the port(s)
-* `-v /config` - where qbittorrent should store its config files
-* `-v /downloads` - path to downloads
-* `-e PGID` for GroupID - see below for explanation
-* `-e PUID` for UserID - see below for explanation
-* `-e UMASK_SET` for umask setting of qbittorrent, *optional* , default if left unset is 022. 
-* `-e TZ` for timezone information, eg Europe/London
+## User / Group Identifiers
 
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`.
+When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
-### User / Group Identifiers
+Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
-
-In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
+In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
 
 ```
-  $ id <dockeruser>
+  $ id username
     uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
 ```
 
-## Setting up the application
+&nbsp;
+## Application Setup
 
-The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.
+The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
 
-Change username/password via the webui in the webui section of settings.
+Change username/password via the webui in the webui section of settings.  
 
 
-## Info
+### WEBUI_PORT variable
 
-Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
+Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
 
-To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
+For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090  
 
+This should alleviate the "white screen" issue.  
+
+If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
+
+edit or add the following lines  
+
+```
+WebUI\Address=*
+
+WebUI\ServerDomains=*
+```
+
+
+
+## Support Info
+
+* Shell access whilst the container is running: `docker exec -it qbittorrent /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
 * container version number 
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
-
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' qbittorrent`
 * image version number
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/qbittorrent`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/qbittorrent`
 
 ## Versions
 
-+ **01.08.17:** Initial Release.
+* **14.01.19:** - Rebase to Ubuntu, add multi arch and pipeline logic.
+* **25.09.18:** - Use buildstage type build, bump qbitorrent to 4.1.3.
+* **14.08.18:** - Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2.
+* **08.06.18:** - Bump qbitorrent to 4.1.1.
+* **26.04.18:** - Bump libtorrent to 1.1.7.
+* **02.03.18:** - Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6.
+* **02.01.18:** - Deprecate cpu_core routine lack of scaling.
+* **19.12.17:** - Update to v4.0.3.
+* **09.02.17:** - Rebase to alpine 3.7
+* **01.12.17:** - Update to v4.0.2.
+* **27.11.17:** - Update to v4 and use cpu_core routine to speed up builds.
+* **16.09.17:** - Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui.
+* **01.08.17:** - Initial Release.
+* **12.02.18:** - Initial Release.

jenkins-vars.yml

@@ -0,0 +1,27 @@
+---
+
+# 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
+repo_vars:
+  - CONTAINER_NAME = 'qbittorrent'
+  - BUILD_VERSION_ARG = 'QBITTORRENT_VERSION'
+  - LS_USER = 'linuxserver'
+  - LS_REPO = 'docker-qbittorrent'
+  - DOCKERHUB_IMAGE = 'linuxserver/qbittorrent'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
+  - DIST_IMAGE = 'ubuntu'
+  - MULTIARCH='true'
+  - CI='true'
+  - CI_WEB='true'
+  - CI_PORT='8080'
+  - CI_SSL='false'
+  - CI_DELAY='120'
+  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_AUTH='user:password'
+  - CI_WEBPATH=''

package_versions.txt

@@ -0,0 +1,177 @@
+adduser/now 3.116ubuntu1 all [installed,local]
+apt/now 1.6.6ubuntu0.1 amd64 [installed,local]
+apt-utils/now 1.6.6ubuntu0.1 amd64 [installed,local]
+base-files/now 10.1ubuntu2.3 amd64 [installed,local]
+base-passwd/now 3.5.44 amd64 [installed,local]
+bash/now 4.4.18-2ubuntu1 amd64 [installed,local]
+bsdutils/now 1:2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+bzip2/now 1.0.6-8.1 amd64 [installed,local]
+ca-certificates/now 20180409 all [installed,local]
+coreutils/now 8.28-1ubuntu1 amd64 [installed,local]
+curl/now 7.58.0-2ubuntu3.5 amd64 [installed,local]
+dash/now 0.5.8-2.10 amd64 [installed,local]
+dbus/now 1.12.2-1ubuntu1 amd64 [installed,local]
+debconf/now 1.5.66 all [installed,local]
+debianutils/now 4.8.4 amd64 [installed,local]
+diffutils/now 1:3.6-1 amd64 [installed,local]
+dirmngr/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+dpkg/now 1.19.0.5ubuntu2.1 amd64 [installed,local]
+e2fsprogs/now 1.44.1-1ubuntu1 amd64 [installed,local]
+fdisk/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+file/now 1:5.32-2ubuntu0.1 amd64 [installed,local]
+findutils/now 4.6.0+git+20170828-2 amd64 [installed,local]
+gcc-8-base/now 8.2.0-1ubuntu2~18.04 amd64 [installed,local]
+geoip-bin/now 1.6.12-1 amd64 [installed,local]
+geoip-database/now 20180315-1 all [installed,local]
+gnupg/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gnupg-l10n/now 2.2.4-1ubuntu1.2 all [installed,local]
+gnupg-utils/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpg/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpg-agent/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpg-wks-client/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpg-wks-server/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpgconf/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpgsm/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+gpgv/now 2.2.4-1ubuntu1.2 amd64 [installed,local]
+grep/now 3.1-2 amd64 [installed,local]
+gzip/now 1.6-5ubuntu1 amd64 [installed,local]
+hostname/now 3.20 amd64 [installed,local]
+init-system-helpers/now 1.51 all [installed,local]
+krb5-locales/now 1.16-2ubuntu0.1 all [installed,local]
+libacl1/now 2.2.52-3build1 amd64 [installed,local]
+libapparmor1/now 2.12-4ubuntu5.1 amd64 [installed,local]
+libapt-inst2.0/now 1.6.6ubuntu0.1 amd64 [installed,local]
+libapt-pkg5.0/now 1.6.6ubuntu0.1 amd64 [installed,local]
+libasn1-8-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libassuan0/now 2.5.1-2 amd64 [installed,local]
+libattr1/now 1:2.4.47-2build1 amd64 [installed,local]
+libaudit-common/now 1:2.8.2-1ubuntu1 all [installed,local]
+libaudit1/now 1:2.8.2-1ubuntu1 amd64 [installed,local]
+libblkid1/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+libboost-system1.65.1/now 1.65.1+dfsg-0ubuntu5 amd64 [installed,local]
+libbz2-1.0/now 1.0.6-8.1 amd64 [installed,local]
+libc-bin/now 2.27-3ubuntu1 amd64 [installed,local]
+libc6/now 2.27-3ubuntu1 amd64 [installed,local]
+libcap-ng0/now 0.7.7-3.1 amd64 [installed,local]
+libcom-err2/now 1.44.1-1ubuntu1 amd64 [installed,local]
+libcurl4/now 7.58.0-2ubuntu3.5 amd64 [installed,local]
+libdb5.3/now 5.3.28-13.1ubuntu1 amd64 [installed,local]
+libdbus-1-3/now 1.12.2-1ubuntu1 amd64 [installed,local]
+libdebconfclient0/now 0.213ubuntu1 amd64 [installed,local]
+libdouble-conversion1/now 2.0.1-4ubuntu1 amd64 [installed,local]
+libexpat1/now 2.2.5-3 amd64 [installed,local]
+libext2fs2/now 1.44.1-1ubuntu1 amd64 [installed,local]
+libfdisk1/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+libffi6/now 3.2.1-8 amd64 [installed,local]
+libgcc1/now 1:8.2.0-1ubuntu2~18.04 amd64 [installed,local]
+libgcrypt20/now 1.8.1-4ubuntu1.1 amd64 [installed,local]
+libgeoip1/now 1.6.12-1 amd64 [installed,local]
+libglib2.0-0/now 2.56.3-0ubuntu0.18.04.1 amd64 [installed,local]
+libglib2.0-data/now 2.56.3-0ubuntu0.18.04.1 all [installed,local]
+libgmp10/now 2:6.1.2+dfsg-2 amd64 [installed,local]
+libgnutls30/now 3.5.18-1ubuntu1 amd64 [installed,local]
+libgpg-error0/now 1.27-6 amd64 [installed,local]
+libgssapi-krb5-2/now 1.16-2ubuntu0.1 amd64 [installed,local]
+libgssapi3-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libhcrypto4-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libheimbase1-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libheimntlm0-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libhogweed4/now 3.4-1 amd64 [installed,local]
+libhx509-5-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libicu60/now 60.2-3ubuntu3 amd64 [installed,local]
+libidn2-0/now 2.0.4-1.1build2 amd64 [installed,local]
+libk5crypto3/now 1.16-2ubuntu0.1 amd64 [installed,local]
+libkeyutils1/now 1.5.9-9.2ubuntu2 amd64 [installed,local]
+libkrb5-26-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libkrb5-3/now 1.16-2ubuntu0.1 amd64 [installed,local]
+libkrb5support0/now 1.16-2ubuntu0.1 amd64 [installed,local]
+libksba8/now 1.3.5-2 amd64 [installed,local]
+libldap-2.4-2/now 2.4.45+dfsg-1ubuntu1.1 amd64 [installed,local]
+libldap-common/now 2.4.45+dfsg-1ubuntu1.1 all [installed,local]
+liblz4-1/now 0.0~r131-2ubuntu3 amd64 [installed,local]
+liblzma5/now 5.2.2-1.3 amd64 [installed,local]
+libmagic-mgc/now 1:5.32-2ubuntu0.1 amd64 [installed,local]
+libmagic1/now 1:5.32-2ubuntu0.1 amd64 [installed,local]
+libmount1/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+libncurses5/now 6.1-1ubuntu1.18.04 amd64 [installed,local]
+libncursesw5/now 6.1-1ubuntu1.18.04 amd64 [installed,local]
+libnettle6/now 3.4-1 amd64 [installed,local]
+libnghttp2-14/now 1.30.0-1ubuntu1 amd64 [installed,local]
+libnpth0/now 1.5-3 amd64 [installed,local]
+libp11-kit0/now 0.23.9-2 amd64 [installed,local]
+libpam-modules/now 1.1.8-3.6ubuntu2 amd64 [installed,local]
+libpam-modules-bin/now 1.1.8-3.6ubuntu2 amd64 [installed,local]
+libpam-runtime/now 1.1.8-3.6ubuntu2 all [installed,local]
+libpam0g/now 1.1.8-3.6ubuntu2 amd64 [installed,local]
+libpcre3/now 2:8.39-9 amd64 [installed,local]
+libprocps6/now 2:3.3.12-3ubuntu1.1 amd64 [installed,local]
+libpsl5/now 0.19.1-5build1 amd64 [installed,local]
+libpython-stdlib/now 2.7.15~rc1-1 amd64 [installed,local]
+libpython2.7-minimal/now 2.7.15~rc1-1ubuntu0.1 amd64 [installed,local]
+libpython2.7-stdlib/now 2.7.15~rc1-1ubuntu0.1 amd64 [installed,local]
+libqt5core5a/now 5.9.5+dfsg-0ubuntu1 amd64 [installed,local]
+libqt5dbus5/now 5.9.5+dfsg-0ubuntu1 amd64 [installed,local]
+libqt5network5/now 5.9.5+dfsg-0ubuntu1 amd64 [installed,local]
+libqt5xml5/now 5.9.5+dfsg-0ubuntu1 amd64 [installed,local]
+libreadline7/now 7.0-3 amd64 [installed,local]
+libroken18-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+librtmp1/now 2.4+20151223.gitfa8646d.1-1 amd64 [installed,local]
+libsasl2-2/now 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 [installed,local]
+libsasl2-modules/now 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 [installed,local]
+libsasl2-modules-db/now 2.1.27~101-g0780600+dfsg-3ubuntu2 amd64 [installed,local]
+libseccomp2/now 2.3.1-2.1ubuntu4 amd64 [installed,local]
+libselinux1/now 2.7-2build2 amd64 [installed,local]
+libsemanage-common/now 2.7-2build2 all [installed,local]
+libsemanage1/now 2.7-2build2 amd64 [installed,local]
+libsepol1/now 2.7-1 amd64 [installed,local]
+libsmartcols1/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+libsqlite3-0/now 3.22.0-1 amd64 [installed,local]
+libss2/now 1.44.1-1ubuntu1 amd64 [installed,local]
+libssl1.1/now 1.1.0g-2ubuntu4.3 amd64 [installed,local]
+libstdc++6/now 8.2.0-1ubuntu2~18.04 amd64 [installed,local]
+libsystemd0/now 237-3ubuntu10.11 amd64 [installed,local]
+libtasn1-6/now 4.13-2 amd64 [installed,local]
+libtinfo5/now 6.1-1ubuntu1.18.04 amd64 [installed,local]
+libtorrent-rasterbar9/now 1.1.11+git20181119.25a1f12991+patched-configure-1ppa1~18.04 amd64 [installed,local]
+libudev1/now 237-3ubuntu10.11 amd64 [installed,local]
+libunistring2/now 0.9.9-0ubuntu1 amd64 [installed,local]
+libuuid1/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+libwind0-heimdal/now 7.5.0+dfsg-1 amd64 [installed,local]
+libxml2/now 2.9.4+dfsg1-6.1ubuntu1.2 amd64 [installed,local]
+libzstd1/now 1.3.3+dfsg-2ubuntu1 amd64 [installed,local]
+locales/now 2.27-3ubuntu1 all [installed,local]
+login/now 1:4.5-1ubuntu1 amd64 [installed,local]
+lsb-base/now 9.20170808ubuntu1 all [installed,local]
+mawk/now 1.3.3-17ubuntu3 amd64 [installed,local]
+mime-support/now 3.60ubuntu1 all [installed,local]
+mount/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+ncurses-base/now 6.1-1ubuntu1.18.04 all [installed,local]
+ncurses-bin/now 6.1-1ubuntu1.18.04 amd64 [installed,local]
+openssl/now 1.1.0g-2ubuntu4.3 amd64 [installed,local]
+p7zip/now 16.02+dfsg-6 amd64 [installed,local]
+p7zip-full/now 16.02+dfsg-6 amd64 [installed,local]
+passwd/now 1:4.5-1ubuntu1 amd64 [installed,local]
+perl-base/now 5.26.1-6ubuntu0.3 amd64 [installed,local]
+pinentry-curses/now 1.1.0-1 amd64 [installed,local]
+procps/now 2:3.3.12-3ubuntu1.1 amd64 [installed,local]
+publicsuffix/now 20180223.1310-1 all [installed,local]
+python/now 2.7.15~rc1-1 amd64 [installed,local]
+python-minimal/now 2.7.15~rc1-1 amd64 [installed,local]
+python2.7/now 2.7.15~rc1-1ubuntu0.1 amd64 [installed,local]
+python2.7-minimal/now 2.7.15~rc1-1ubuntu0.1 amd64 [installed,local]
+qbittorrent-nox/now 4.1.5.99~201812282032-6681-264b689~ubuntu18.04.1 amd64 [installed,local]
+qttranslations5-l10n/now 5.9.5-0ubuntu1 all [installed,local]
+readline-common/now 7.0-3 all [installed,local]
+sed/now 4.4-2 amd64 [installed,local]
+sensible-utils/now 0.0.12 all [installed,local]
+shared-mime-info/now 1.9-2 amd64 [installed,local]
+sysvinit-utils/now 2.88dsf-59.10ubuntu1 amd64 [installed,local]
+tar/now 1.29b-2 amd64 [installed,local]
+tzdata/now 2018i-0ubuntu0.18.04 all [installed,local]
+ubuntu-keyring/now 2018.09.18.1~18.04.0 all [installed,local]
+unrar/now 1:5.5.8-1 amd64 [installed,local]
+unzip/now 6.0-21ubuntu1 amd64 [installed,local]
+util-linux/now 2.31.1-0.4ubuntu3.3 amd64 [installed,local]
+xdg-user-dirs/now 0.17-1ubuntu1 amd64 [installed,local]
+xz-utils/now 5.2.2-1.3 amd64 [installed,local]
+zlib1g/now 1:1.2.11.dfsg-0ubuntu2 amd64 [installed,local]

patches/main.patch

@@ -1,14 +0,0 @@
---- src/app/main.cpp
-+++ src/app/main.cpp
-@@ -59,8 +59,9 @@
-
- #ifdef Q_OS_UNIX
- #include <signal.h>
--#include <execinfo.h>
--#include "stacktrace.h"
-+static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63) {
-+    fprintf(out, "stack trace:\n N/A (%d)", max_frames);
-+}
- #endif // Q_OS_UNIX
-
- #ifdef STACKTRACE_WIN

readme-vars.yml

@@ -0,0 +1,78 @@
+---
+
+# project information
+project_name: qbittorrent
+project_url: "https://www.qbittorrent.org/"
+project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/qbittorrent-icon.png"
+project_blurb: "The [{{ project_name|capitalize }}]({{ project_url }}) project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library."
+project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
+
+# supported architectures
+available_architectures:
+  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"}
+
+# container parameters
+common_param_env_vars_enabled: true
+param_container_name: "{{ project_name }}"
+param_usage_include_vols: true
+param_volumes:
+  - { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Contains all relevant configuration files." }
+param_usage_include_ports: true
+param_ports:
+  - { external_port: "6881", internal_port: "6881", port_desc: "tcp connection port" }
+  - { external_port: "6881", internal_port: "6881/udp", port_desc: "udp connection port" }
+  - { external_port: "8080", internal_port: "8080", port_desc: "http gui" }
+param_usage_include_env: true
+param_env_vars:
+  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
+  - { env_var: "UMASK_SET", env_value: "022", desc: "for umask setting of qbittorrent, optional , default if left unset is 022"}
+  - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}
+
+# optional parameters
+optional_block_1: false
+optional_block_1_items: ""
+
+# application setup block
+app_setup_block_enabled: true
+app_setup_block: |
+  The webui is at `<your-ip>:8080` and the default username/password is `admin/adminadmin`.  
+  
+  Change username/password via the webui in the webui section of settings.  
+
+
+  ### WEBUI_PORT variable
+  
+  Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
+  
+  For example, to set the port to 8090 you need to set -p 8090:8090 and -e WEBUI_PORT=8090  
+  
+  This should alleviate the "white screen" issue.  
+  
+  If you have no webui , check the file /config/qBittorrent/qBittorrent.conf  
+  
+  edit or add the following lines  
+
+  ```
+  WebUI\Address=*
+  
+  WebUI\ServerDomains=*
+  ```
+
+# changelog
+changelogs:
+  - { date: "14.01.19:", desc: "Rebase to Ubuntu, add multi arch and pipeline logic." }
+  - { date: "25.09.18:", desc: "Use buildstage type build, bump qbitorrent to 4.1.3." }
+  - { date: "14.08.18:", desc: "Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2." }
+  - { date: "08.06.18:", desc: "Bump qbitorrent to 4.1.1." }
+  - { date: "26.04.18:", desc: "Bump libtorrent to 1.1.7." }
+  - { date: "02.03.18:", desc: "Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6." }
+  - { date: "02.01.18:", desc: "Deprecate cpu_core routine lack of scaling." }
+  - { date: "19.12.17:", desc: "Update to v4.0.3." }
+  - { date: "09.02.17:", desc: "Rebase to alpine 3.7" }
+  - { date: "01.12.17:", desc: "Update to v4.0.2." }
+  - { date: "27.11.17:", desc: "Update to v4 and use cpu_core routine to speed up builds." }
+  - { date: "16.09.17:", desc: "Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui." }
+  - { date: "01.08.17:", desc: "Initial Release." }
+  - { date: "12.02.18:", desc: "Initial Release." }

root/defaults/qBittorrent.conf

@@ -11,3 +11,5 @@ Connection\PortRangeMin=6881
 Downloads\SavePath=/downloads/
 Downloads\ScanDirsV2=@Variant(\0\0\0\x1c\0\0\0\0)
 Downloads\TempPath=/downloads/incomplete/
+WebUI\Address=*
+WebUI\ServerDomains=*

root/etc/cont-init.d/30-config

@@ -9,6 +9,11 @@ mkdir -p \
 [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
 	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
+fi
+
 # permissions
 chown -R abc:abc \
 	/config

root/etc/services.d/qbittorrent/run

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
 
 UMASK_SET=${UMASK_SET:-022}
+WEBUI_PORT=${WEBUI_PORT:-8080}
 
 umask "$UMASK_SET"
 
 exec \
-	s6-setuidgid abc /usr/bin/qbittorrent-nox
+	s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"