From 5afc1ce3ef5d69b3530a200cdfeced412d754682 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 25 Dec 2023 13:51:52 -0600 Subject: [PATCH] Only pull stable releases of qbittorrent-cli Signed-off-by: Eric Nemchik --- Dockerfile | 10 ++++++---- Dockerfile.aarch64 | 10 ++++++---- readme-vars.yml | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a8c7dd..38b65a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.18 ARG BUILD_DATE ARG VERSION ARG QBITTORRENT_VERSION -ARG QBT_VERSION +ARG QBT_CLI_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" @@ -40,11 +40,13 @@ RUN \ chmod +x /app/qbittorrent-nox && \ echo "***** install qbitorrent-cli ****" && \ mkdir /qbt && \ - QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + if [ -z ${QBT_CLI_VERSION+x} ]; then \ + QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \ + | jq -r '. | .tag_name'); \ + fi && \ curl -o \ /tmp/qbt.tar.gz -L \ - "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \ + "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-x64-${QBT_CLI_VERSION#v}.tar.gz" && \ tar xf \ /tmp/qbt.tar.gz -C \ /qbt && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bd127b0..c254ae5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,7 +8,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 ARG BUILD_DATE ARG VERSION ARG QBITTORRENT_VERSION -ARG QBT_VERSION +ARG QBT_CLI_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" @@ -40,11 +40,13 @@ RUN \ chmod +x /app/qbittorrent-nox && \ echo "***** install qbitorrent-cli ****" && \ mkdir /qbt && \ - QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + if [ -z ${QBT_CLI_VERSION+x} ]; then \ + QBT_CLI_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases/latest" \ + | jq -r '. | .tag_name'); \ + fi && \ curl -o \ /tmp/qbt.tar.gz -L \ - "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \ + "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_CLI_VERSION}/qbt-linux-alpine-arm64-${QBT_CLI_VERSION#v}.tar.gz" && \ tar xf \ /tmp/qbt.tar.gz -C \ /qbt && \ diff --git a/readme-vars.yml b/readme-vars.yml index 073e1a4..c5d8b30 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,6 +52,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."} - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - { date: "17.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }