Merge pull request #200 from linuxserver/lsiown-master

.github/workflows/external_trigger.yml

@@ -49,8 +49,12 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          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_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then

README.md

@@ -65,6 +65,7 @@ This image provides various versions that are available via tags. Please read th
 | Tag | Available | Description |
 | :----: | :----: |--- |
 | latest | ✅ | Stable qbittorrent releases |
+| libtorrentv1 | ✅ | Static qbittorrent builds using libtorrent v1 |
 
 ## Application Setup
 
@@ -263,6 +264,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.10.22:** - Add libtorrentv1 branch.
 * **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
 * **12.08.22:** - Bump unrar to 6.1.7.
 * **16.06.22:** - Rebase to Alpine 3.16 from edge.

package_versions.txt

@@ -1,55 +1,55 @@
-alpine-baselayout-3.3.0-r2
-alpine-baselayout-data-3.3.0-r2
+alpine-baselayout-3.4.0-r0
+alpine-baselayout-data-3.4.0-r0
 alpine-keys-2.4-r1
-apk-tools-2.12.9-r7
-bash-5.2.2-r0
-brotli-libs-1.0.9-r8
+apk-tools-2.12.10-r1
+bash-5.2.2-r1
+brotli-libs-1.0.9-r9
 busybox-1.35.0-r27
 busybox-binsh-1.35.0-r27
 ca-certificates-20220614-r2
 ca-certificates-bundle-20220614-r2
 coreutils-9.1-r0
-curl-7.85.0-r0
+curl-7.86.0-r1
 dbus-libs-1.14.4-r0
 double-conversion-3.2.1-r0
 gdbm-1.23-r0
-glib-2.74.0-r4
+glib-2.74.1-r2
 icu-data-en-72.1-r1
 icu-libs-72.1-r1
-jq-1.6-r1
+jq-1.6-r2
 libacl-2.3.1-r1
 libattr-2.5.1-r1
 libb2-0.98.1-r2
 libblkid-2.38.1-r0
 libbz2-1.0.8-r3
 libc-utils-0.7.2-r3
-libcrypto3-3.0.5-r3
-libcurl-7.85.0-r0
-libexpat-2.4.9-r0
-libffi-3.4.3-r0
-libgcc-12.2.1_git20220924-r3
-libgomp-12.2.1_git20220924-r3
+libcrypto3-3.0.7-r0
+libcurl-7.86.0-r1
+libexpat-2.5.0-r0
+libffi-3.4.4-r0
+libgcc-12.2.1_git20220924-r4
+libgomp-12.2.1_git20220924-r4
 libintl-0.21.1-r1
 libmount-2.38.1-r0
 libpcre2-16-10.40-r0
 libproc-3.3.17-r2
-libssl3-3.0.5-r3
-libstdc++-12.2.1_git20220924-r3
+libssl3-3.0.7-r0
+libstdc++-12.2.1_git20220924-r4
 libtorrent-rasterbar-2.0.8-r0
 linux-pam-1.5.2-r1
 mpdecimal-2.5.1-r1
-musl-1.2.3-r1
-musl-utils-1.2.3-r1
-ncurses-libs-6.3_p20221008-r0
-ncurses-terminfo-base-6.3_p20221008-r0
+musl-1.2.3-r4
+musl-utils-1.2.3-r2
+ncurses-libs-6.3_p20221029-r0
+ncurses-terminfo-base-6.3_p20221029-r0
 nghttp2-libs-1.50.0-r0
 oniguruma-6.9.8-r0
-openssl-3.0.5-r3
+openssl-3.0.7-r0
 p7zip-17.04-r3
 pcre2-10.40-r0
 procps-3.3.17-r2
-python3-3.10.8-r1
-qbittorrent-nox-4.4.5-r2
+python3-3.10.8-r3
+qbittorrent-nox-4.4.5-r3
 qt6-qtbase-6.4.0-r1
 readline-8.2.0-r0
 scanelf-1.3.5-r1
@@ -57,7 +57,7 @@ shadow-4.10-r3
 skalibs-2.12.0.1-r0
 sqlite-libs-3.39.4-r0
 ssl_client-1.35.0-r27
-tzdata-2022e-r0
+tzdata-2022f-r1
 utmps-libs-0.1.2.0-r1
 xz-5.2.7-r0
 xz-libs-5.2.7-r0

readme-vars.yml

@@ -17,6 +17,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable qbittorrent releases" }
+  - { tag: "libtorrentv1", desc: "Static qbittorrent builds using libtorrent v1" }  
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -68,6 +69,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.10.22:", desc: "Add libtorrentv1 branch." }
   - { 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: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }

root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

@@ -11,10 +11,10 @@ fi
 # chown download directory if currently not set to abc
 if [[ -d /downloads ]]; then
     if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
-        chown -R abc:abc /downloads
+        lsiown -R abc:abc /downloads
     fi
 fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config