Bot Updating Templated Files

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(echo release-$(curl -s 'https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog' | grep -Po '^\w{3} \w{3} \d{2} \d{4} - .* - \K(v\d+\.\d+\.\d+\.?\d?)$' | head -1 | cut -c2-))
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET 'https://api.github.com/repos/qbittorrent/qBittorrent/tags' | jq -r '.[].name' | grep -Po -m 1 '^release-(\d+(\.)?)+$')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for qbittorrent branch master"

Dockerfile

@@ -19,6 +19,7 @@ RUN \
     curl \
     git \
     grep \
+    jq \
     libtool \
     linux-headers \
     perl \
@@ -53,7 +54,7 @@ RUN \
   cmake --install build && \
   echo "**** build qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION="release-"$(curl -s "https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog" | grep -Po '^\w{3} \w{3} \d{2} \d{4} - .* - \K(v\d+\.\d+\.\d+\.?\d?)$' | head -1 | cut -c2-); \
+    QBITTORRENT_VERSION=$(curl -sX GET "https://api.github.com/repos/qbittorrent/qBittorrent/tags" | jq -r '.[].name' | grep -Po -m 1 '^release-(\d+(\.)?)+$'); \
   fi && \
   git clone --shallow-submodules --recurse-submodules https://github.com/qbittorrent/qBittorrent.git ~/qbittorrent && cd ~/qbittorrent && \
   git checkout "$(git tag -l --sort=-v:refname "${QBITTORRENT_VERSION}" | head -n 1)" && \

Dockerfile.aarch64

@@ -19,6 +19,7 @@ RUN \
     curl \
     git \
     grep \
+    jq \
     libtool \
     linux-headers \
     perl \
@@ -53,7 +54,7 @@ RUN \
   cmake --install build && \
   echo "**** build qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION="release-"$(curl -s "https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog" | grep -Po '^\w{3} \w{3} \d{2} \d{4} - .* - \K(v\d+\.\d+\.\d+\.?\d?)$' | head -1 | cut -c2-); \
+    QBITTORRENT_VERSION=$(curl -sX GET "https://api.github.com/repos/qbittorrent/qBittorrent/tags" | jq -r '.[].name' | grep -Po -m 1 '^release-(\d+(\.)?)+$'); \
   fi && \
   git clone --shallow-submodules --recurse-submodules https://github.com/qbittorrent/qBittorrent.git ~/qbittorrent && cd ~/qbittorrent && \
   git checkout "$(git tag -l --sort=-v:refname "${QBITTORRENT_VERSION}" | head -n 1)" && \

Dockerfile.armhf

@@ -19,6 +19,7 @@ RUN \
     curl \
     git \
     grep \
+    jq \
     libtool \
     linux-headers \
     perl \
@@ -53,7 +54,7 @@ RUN \
   cmake --install build && \
   echo "**** build qbittorrent ****" && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION="release-"$(curl -s "https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog" | grep -Po '^\w{3} \w{3} \d{2} \d{4} - .* - \K(v\d+\.\d+\.\d+\.?\d?)$' | head -1 | cut -c2-); \
+    QBITTORRENT_VERSION=$(curl -sX GET "https://api.github.com/repos/qbittorrent/qBittorrent/tags" | jq -r '.[].name' | grep -Po -m 1 '^release-(\d+(\.)?)+$'); \
   fi && \
   git clone --shallow-submodules --recurse-submodules https://github.com/qbittorrent/qBittorrent.git ~/qbittorrent && cd ~/qbittorrent && \
   git checkout "$(git tag -l --sort=-v:refname "${QBITTORRENT_VERSION}" | head -n 1)" && \

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' echo release-$(curl -s 'https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog' | grep -Po '^\\w{3} \\w{3} \\d{2} \\d{4} - .* - \\K(v\\d+\\.\\d+\\.\\d+\\.?\\d?)$' | head -1 | cut -c2-) ''',
+            script: ''' curl -sX GET 'https://api.github.com/repos/qbittorrent/qBittorrent/tags' | jq -r '.[].name' | grep -Po -m 1 '^release-(\\d+(\\.)?)+$' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -264,6 +264,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.02.22:** - Add jq to build-stage
 * **07.01.22:** - Rebase to Alpine, build from source.
 * **06.01.22:** - Deprecate unstable branch.
 * **10.02.21:** - Rebase to focal.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-qbittorrent
 external_type: na
-custom_version_command: "echo release-$(curl -s 'https://raw.githubusercontent.com/qbittorrent/qBittorrent/HEAD/Changelog' | grep -Po '^\\\\w{3} \\\\w{3} \\\\d{2} \\\\d{4} - .* - \\\\K(v\\\\d+\\\\.\\\\d+\\\\.\\\\d+\\\\.?\\\\d?)$' | head -1 | cut -c2-)"
+custom_version_command: "curl -sX GET 'https://api.github.com/repos/qbittorrent/qBittorrent/tags' | jq -r '.[].name' | grep -Po -m 1 '^release-(\\\\d+(\\\\.)?)+$'"
 release_type: stable
 release_tag: latest
 ls_branch: master

package_versions.txt

@@ -3,14 +3,14 @@ alpine-keys-2.4-r1
 apk-tools-2.12.7-r3
 bash-5.1.8-r0
 brotli-libs-1.0.9-r5
-busybox-1.34.1-r3
-ca-certificates-20191127-r7
-ca-certificates-bundle-20191127-r7
+busybox-1.34.1-r4
+ca-certificates-20211220-r0
+ca-certificates-bundle-20211220-r0
 coreutils-9.0-r2
 curl-7.80.0-r0
 dbus-libs-1.12.20-r4
 double-conversion-3.1.5-r0
-expat-2.4.1-r0
+expat-2.4.4-r0
 gdbm-1.22-r0
 geoip-1.6.12-r2
 glib-2.70.1-r0
@@ -18,7 +18,7 @@ icu-libs-69.1-r1
 libacl-2.2.53-r0
 libattr-2.5.1-r1
 libb2-0.98.1-r1
-libblkid-2.37.2-r1
+libblkid-2.37.4-r0
 libbsd-0.11.3-r1
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
@@ -31,14 +31,14 @@ libgomp-10.3.1_git20211027-r0
 libice-1.0.10-r0
 libintl-0.21-r0
 libmd-1.0.3-r0
-libmount-2.37.2-r1
+libmount-2.37.4-r0
 libpcre2-16-10.39-r0
 libproc-3.3.17-r0
 libretls-3.3.4-r2
 libsm-1.2.3-r0
 libssl1.1-1.1.1l-r8
 libstdc++-10.3.1_git20211027-r0
-libuuid-2.37.2-r1
+libuuid-2.37.4-r0
 libx11-1.7.2-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
@@ -65,7 +65,7 @@ scanelf-1.3.3-r0
 shadow-4.8.1-r1
 skalibs-2.11.0.0-r0
 sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r3
+ssl_client-1.34.1-r4
 tzdata-2021e-r0
 unrar-6.0.7-r0
 unzip-6.0-r9

readme-vars.yml

@@ -69,6 +69,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.02.22:", desc: "Add jq to build-stage" }
   - { date: "07.01.22:", desc: "Rebase to Alpine, build from source." }
   - { date: "06.01.22:", desc: "Deprecate unstable branch." }
   - { date: "10.02.21:", desc: "Rebase to focal." }