Compare commits

...

31 Commits

Author SHA1 Message Date
LinuxServer-CI
81d2117056 Bot Updating Package Versions 2023-02-13 01:49:40 -06:00
LinuxServer-CI
66c061972d Bot Updating Package Versions 2023-02-12 21:52:31 -06:00
LinuxServer-CI
f11127fc32 Bot Updating Templated Files 2023-02-13 04:48:25 +01:00
LinuxServer-CI
640ae3e999 Bot Updating Templated Files 2023-02-13 04:47:08 +01:00
LinuxServer-CI
aed8420354 Bot Updating Package Versions 2023-02-05 21:47:58 -06:00
LinuxServer-CI
a3a1398b16 Bot Updating Package Versions 2023-01-30 04:48:09 +01:00
LinuxServer-CI
b68208bdbc Bot Updating Package Versions 2023-01-22 21:48:04 -06:00
LinuxServer-CI
538b1ac1a2 Bot Updating Package Versions 2023-01-15 08:58:32 -06:00
Adam
af5ae7b15b Merge pull request #220 from linuxserver/buildbase-master 2023-01-15 14:55:47 +00:00
TheSpad
b3d6e8e631 Use build-base meta package for building unrar 2023-01-15 14:21:18 +00:00
LinuxServer-CI
d5288897f7 Bot Updating Package Versions 2023-01-08 21:48:09 -06:00
LinuxServer-CI
c9be56f0df Bot Updating Package Versions 2023-01-02 04:48:09 +01:00
LinuxServer-CI
7ffac23daa Bot Updating Package Versions 2022-12-25 21:48:15 -06:00
LinuxServer-CI
09d0018747 Bot Updating Package Versions 2022-12-22 03:04:27 +01:00
LinuxServer-CI
49f9389de4 Bot Updating Package Versions 2022-12-19 04:48:14 +01:00
LinuxServer-CI
941102a69f Bot Updating Package Versions 2022-12-12 04:48:15 +01:00
LinuxServer-CI
281e720b3c Bot Updating Package Versions 2022-12-04 21:47:50 -06:00
LinuxServer-CI
a57af7278d Bot Updating Package Versions 2022-11-29 18:44:05 +01:00
LinuxServer-CI
634f4e6c9e Bot Updating Templated Files 2022-11-29 18:41:37 +01:00
Adam
8cf402cc99 Merge pull request #203 from linuxserver/openssl1-master 2022-11-29 17:40:22 +00:00
TheSpad
85eb8bbe30 Add openssl1.1-compat for qbittorrent-cli 2022-11-29 15:56:12 +00:00
LinuxServer-CI
1a5fdb0072 Bot Updating Package Versions 2022-11-27 21:53:39 -06:00
LinuxServer-CI
c3b95fdabf Bot Updating Package Versions 2022-11-21 05:06:39 +01:00
Adam
65621a9ba3 Merge pull request #200 from linuxserver/lsiown-master 2022-11-13 15:34:22 +00:00
TheSpad
5f0e71b743 Use lsiown for init 2022-11-12 14:23:13 +00:00
LinuxServer-CI
121cbb9462 Bot Updating Package Versions 2022-11-12 05:52:56 -06:00
LinuxServer-CI
ca5673a409 Bot Updating Templated Files 2022-11-12 12:48:12 +01:00
LinuxServer-CI
17dabb494e Bot Updating Package Versions 2022-11-06 22:29:08 -06:00
Adam
f196789a76 Merge pull request #198 from linuxserver/readme-v1 2022-10-31 14:12:47 +00:00
TheSpad
16364f2964 Update changelog and tag list 2022-10-31 13:51:29 +00:00
LinuxServer-CI
83b482ab7a Bot Updating Package Versions 2022-10-30 23:37:46 -05:00
22 changed files with 236 additions and 155 deletions

View File

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

View File

@@ -1,40 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
---
[linuxserverurl]: https://linuxserver.io
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
<!--- Provide a general summary of the bug in the Title above -->
------------------------------
## Expected Behavior
<!--- Tell us what should happen -->
## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->
## Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.
## Environment
**OS:**
**CPU architecture:** x86_64/arm32/arm64
**How docker service was installed:**
<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
## Command used to create docker container (run/create/compose/screenshot)
<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
## Docker logs
<!--- Provide a full docker log, output of "docker logs qbittorrent" -->

77
.github/ISSUE_TEMPLATE/issue.bug.yml vendored Normal file
View File

@@ -0,0 +1,77 @@
# Based on the issue template
name: Bug report
description: Create a report to help us improve
title: "[BUG] <title>"
labels: [Bug]
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: Tell us what happens instead of the expected behavior.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: Tell us what should happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: true
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- **How docker service was installed**: distro's packagemanager
value: |
- OS:
- How docker service was installed:
render: markdown
validations:
required: false
- type: dropdown
attributes:
label: CPU architecture
options:
- x86-64
- arm64
- armhf
validations:
required: true
- type: textarea
attributes:
label: Docker creation
description: |
Command used to create docker container
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
render: bash
validations:
required: true
- type: textarea
attributes:
description: |
Provide a full docker log, output of "docker logs linuxserver.io"
label: Container logs
placeholder: |
Output of `docker logs linuxserver.io`
render: bash
validations:
required: true

View File

@@ -1,25 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
---
[linuxserverurl]: https://linuxserver.io
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
<!--- Provide a general summary of the request in the Title above -->
------------------------------
## Desired Behavior
<!--- Tell us what should happen -->
## Current Behavior
<!--- Tell us what happens instead of the expected behavior -->
## Alternatives Considered
<!--- Tell us what other options you have tried or considered -->

View File

@@ -0,0 +1,31 @@
# Based on the issue template
name: Feature request
description: Suggest an idea for this project
title: "[FEAT] <title>"
labels: [enhancement]
body:
- type: checkboxes
attributes:
label: Is this a new feature request?
description: Please search to see if a feature request already exists.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Wanted change
description: Tell us what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Reason for change
description: Justify your request, why do you want it, what is the benefit.
validations:
required: true
- type: textarea
attributes:
label: Proposed code change
description: Do you have a potential code change in mind?
validations:
required: false

View File

@@ -0,0 +1,12 @@
name: Comment on invalid interaction
on:
issues:
types:
- labeled
jobs:
add-comment-on-invalid:
if: github.event.label.name == 'invalid'
permissions:
issues: write
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
secrets: inherit

View File

@@ -7,7 +7,7 @@ jobs:
external-trigger-master: external-trigger-master:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.3 - uses: actions/checkout@v3.1.0
- name: External Trigger - name: External Trigger
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
@@ -49,8 +49,12 @@ jobs:
| jq -r '.config.digest') | jq -r '.config.digest')
image_info=$(curl -sL \ image_info=$(curl -sL \
--header "Authorization: Bearer ${token}" \ --header "Authorization: Bearer ${token}" \
"https://ghcr.io/v2/${image}/blobs/${digest}" \ "https://ghcr.io/v2/${image}/blobs/${digest}")
| jq -r '.container_config') if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
image_info=$(echo $image_info | jq -r '.config')
else
image_info=$(echo $image_info | jq -r '.container_config')
fi
IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
if [ -z "${IMAGE_VERSION}" ]; then if [ -z "${IMAGE_VERSION}" ]; then

View File

@@ -9,7 +9,7 @@ jobs:
external-trigger-scheduler: external-trigger-scheduler:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.3 - uses: actions/checkout@v3.1.0
with: with:
fetch-depth: '0' fetch-depth: '0'

View File

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

View File

@@ -7,7 +7,7 @@ jobs:
package-trigger-master: package-trigger-master:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.3 - uses: actions/checkout@v3.1.0
- name: Package Trigger - name: Package Trigger
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'

View File

@@ -9,7 +9,7 @@ jobs:
package-trigger-scheduler: package-trigger-scheduler:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.3 - uses: actions/checkout@v3.1.0
with: with:
fetch-depth: '0' fetch-depth: '0'

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

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

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v3 - uses: actions/stale@v6.0.1
with: with:
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

View File

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

View File

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

View File

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

28
Jenkinsfile vendored
View File

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

View File

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

View File

@@ -1,64 +1,67 @@
alpine-baselayout-3.3.0-r2 alpine-baselayout-3.4.0-r0
alpine-baselayout-data-3.3.0-r2 alpine-baselayout-data-3.4.0-r0
alpine-keys-2.4-r1 alpine-keys-2.4-r1
apk-tools-2.12.9-r7 apk-tools-2.12.11-r0
bash-5.2.2-r0 bash-5.2.15-r0
brotli-libs-1.0.9-r8 brotli-libs-1.0.9-r10
busybox-1.35.0-r27 busybox-1.36.0-r3
busybox-binsh-1.35.0-r27 busybox-binsh-1.36.0-r3
ca-certificates-20220614-r2 ca-certificates-20230106-r0
ca-certificates-bundle-20220614-r2 ca-certificates-bundle-20230106-r0
coreutils-9.1-r0 coreutils-9.1-r0
curl-7.85.0-r0 curl-7.87.0-r3
dbus-libs-1.14.4-r0 dbus-libs-1.14.6-r0
double-conversion-3.2.1-r0 double-conversion-3.2.1-r0
gdbm-1.23-r0 gdbm-1.23-r0
glib-2.74.0-r4 glib-2.74.5-r0
icu-data-en-72.1-r1 icu-data-en-72.1-r2
icu-libs-72.1-r1 icu-libs-72.1-r2
jq-1.6-r1 jq-1.6-r2
libacl-2.3.1-r1 libacl-2.3.1-r1
libattr-2.5.1-r1 libattr-2.5.1-r3
libb2-0.98.1-r2 libb2-0.98.1-r2
libblkid-2.38.1-r0 libblkid-2.38.1-r4
libbz2-1.0.8-r3 libbz2-1.0.8-r4
libc-utils-0.7.2-r3 libc-utils-0.7.2-r4
libcrypto3-3.0.5-r3 libcrypto1.1-1.1.1t-r0
libcurl-7.85.0-r0 libcrypto3-3.0.8-r0
libexpat-2.4.9-r0 libcurl-7.87.0-r3
libffi-3.4.3-r0 libexpat-2.5.0-r0
libgcc-12.2.1_git20220924-r3 libffi-3.4.4-r0
libgomp-12.2.1_git20220924-r3 libgcc-12.2.1_git20220924-r9
libgomp-12.2.1_git20220924-r9
libintl-0.21.1-r1 libintl-0.21.1-r1
libmount-2.38.1-r0 libmount-2.38.1-r4
libpcre2-16-10.40-r0 libpcre2-16-10.42-r0
libproc-3.3.17-r2 libproc-3.3.17-r2
libssl3-3.0.5-r3 libssl1.1-1.1.1t-r0
libstdc++-12.2.1_git20220924-r3 libssl3-3.0.8-r0
libtorrent-rasterbar-2.0.8-r0 libstdc++-12.2.1_git20220924-r9
linux-pam-1.5.2-r1 libtorrent-rasterbar-2.0.8-r2
linux-pam-1.5.2-r3
mpdecimal-2.5.1-r1 mpdecimal-2.5.1-r1
musl-1.2.3-r1 musl-1.2.3-r4
musl-utils-1.2.3-r1 musl-utils-1.2.3-r4
ncurses-libs-6.3_p20221008-r0 ncurses-libs-6.4_p20230128-r0
ncurses-terminfo-base-6.3_p20221008-r0 ncurses-terminfo-base-6.4_p20230128-r0
nghttp2-libs-1.50.0-r0 nghttp2-libs-1.51.0-r0
oniguruma-6.9.8-r0 oniguruma-6.9.8-r0
openssl-3.0.5-r3 openssl-3.0.8-r0
openssl1.1-compat-1.1.1t-r0
p7zip-17.04-r3 p7zip-17.04-r3
pcre2-10.40-r0 pcre2-10.42-r0
procps-3.3.17-r2 procps-3.3.17-r2
python3-3.10.8-r1 python3-3.11.2-r0
qbittorrent-nox-4.4.5-r2 qbittorrent-nox-4.5.1-r1
qt6-qtbase-6.4.0-r1 qt6-qtbase-6.4.2-r0
readline-8.2.0-r0 readline-8.2.0-r0
scanelf-1.3.5-r1 scanelf-1.3.7-r0
shadow-4.10-r3 shadow-4.13-r1
skalibs-2.12.0.1-r0 skalibs-2.13.0.0-r0
sqlite-libs-3.39.4-r0 sqlite-libs-3.40.1-r0
ssl_client-1.35.0-r27 ssl_client-1.36.0-r3
tzdata-2022e-r0 tzdata-2022g-r0
utmps-libs-0.1.2.0-r1 utmps-libs-0.1.2.1-r0
xz-5.2.7-r0 xz-5.4.1-r0
xz-libs-5.2.7-r0 xz-libs-5.4.1-r0
zlib-1.2.13-r0 zlib-1.2.13-r0

View File

@@ -17,6 +17,7 @@ available_architectures:
development_versions: true development_versions: true
development_versions_items: development_versions_items:
- { tag: "latest", desc: "Stable qbittorrent releases" } - { tag: "latest", desc: "Stable qbittorrent releases" }
- { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }
# container parameters # container parameters
common_param_env_vars_enabled: true common_param_env_vars_enabled: true
@@ -68,6 +69,8 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "29.11.22:", desc: "Add openssl1.1-compat for qbittorrent-cli." }
- { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
- { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." } - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
- { date: "12.08.22:", desc: "Bump unrar to 6.1.7." } - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
- { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." } - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }

View File

@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash
# make our folder # make our folder
mkdir -p /config/qBittorrent mkdir -p /config/qBittorrent
@@ -11,10 +12,10 @@ fi
# chown download directory if currently not set to abc # chown download directory if currently not set to abc
if [[ -d /downloads ]]; then if [[ -d /downloads ]]; then
if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
chown -R abc:abc /downloads lsiown -R abc:abc /downloads
fi fi
fi fi
# permissions # permissions
chown -R abc:abc \ lsiown -R abc:abc \
/config /config

View File

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