From a6df3c3fc0603a0b7410f51a63a6cb863f5db9d2 Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Tue, 26 Dec 2023 03:39:19 +0300 Subject: [PATCH] qbittorrent 4.6.2 --- .../epicmorg.ecosysctem.misc.images.yml | 4 ++-- CHANGELOG.md | 1 + Makefile | 2 +- .../qbittorrent/{ => 4.6.2}/Dockerfile | 16 +++++-------- .../Dockerfile.lt1} | 18 ++++++-------- .../qbittorrent/{ => 4.6.2}/Makefile | 22 +++++++----------- .../qbittorrent/{ => 4.6.2}/README.md | 0 .../{ => 4.6.2}/docker-compose.example.yml | 0 .../qbittorrent/4.6.2/docker-compose.yml | 11 +++++++++ .../{ => 4.6.2}/docker-entrypoint.sh | 0 .../{ => 4.6.2}/qbittorrent-icon.png | Bin .../ecosystem/qbittorrent/docker-compose.yml | 15 ------------ 12 files changed, 36 insertions(+), 53 deletions(-) rename linux/ecosystem/qbittorrent/{ => 4.6.2}/Dockerfile (76%) rename linux/ecosystem/qbittorrent/{Dockerfile.stable => 4.6.2/Dockerfile.lt1} (75%) rename linux/ecosystem/qbittorrent/{ => 4.6.2}/Makefile (55%) rename linux/ecosystem/qbittorrent/{ => 4.6.2}/README.md (100%) rename linux/ecosystem/qbittorrent/{ => 4.6.2}/docker-compose.example.yml (100%) create mode 100644 linux/ecosystem/qbittorrent/4.6.2/docker-compose.yml rename linux/ecosystem/qbittorrent/{ => 4.6.2}/docker-entrypoint.sh (100%) rename linux/ecosystem/qbittorrent/{ => 4.6.2}/qbittorrent-icon.png (100%) delete mode 100644 linux/ecosystem/qbittorrent/docker-compose.yml diff --git a/.github/workflows/epicmorg.ecosysctem.misc.images.yml b/.github/workflows/epicmorg.ecosysctem.misc.images.yml index b9e1ebe26..150c103a4 100644 --- a/.github/workflows/epicmorg.ecosysctem.misc.images.yml +++ b/.github/workflows/epicmorg.ecosysctem.misc.images.yml @@ -72,8 +72,8 @@ jobs: - name: Test Make run: make - - name: Build and Deploy qBittorrent - run: cd linux/ecosystem/qbittorrent && make build && make deploy + - name: Build and Deploy qBittorrent 4.6.2 + run: cd linux/ecosystem/qbittorrent/4.6.2 && make build && make deploy ################################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index d7ed0dbca..5c2106145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * `sep-oct-nov-dec` * `nextcloud` upgrade * `nginx` fixed and migrated to `openssl3` + `debion12` base and build stages. + * new, fully `static`, binary in `qbittorrent` images. * `aug` * added `ninjam` server * EOL of `freegpt` by closing project by maintaner - [Em1tSan/freegpt-webui-ru](https://github.com/Em1tSan/freegpt-webui-ru). diff --git a/Makefile b/Makefile index 510cbad30..861cb6bbf 100644 --- a/Makefile +++ b/Makefile @@ -573,7 +573,7 @@ ecosystem-vk2discord-images: cd `pwd`/linux/ecosystem/vk2discord && pwd && make build && make deploy ecosystem-qbittorrent-images: - cd `pwd`/linux/ecosystem/qbittorrent && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/qbittorrent/4.6.2 && pwd && make build && make deploy ecosystem-retracker-images: cd `pwd`/linux/ecosystem/retracker && pwd && make build && make deploy diff --git a/linux/ecosystem/qbittorrent/Dockerfile b/linux/ecosystem/qbittorrent/4.6.2/Dockerfile similarity index 76% rename from linux/ecosystem/qbittorrent/Dockerfile rename to linux/ecosystem/qbittorrent/4.6.2/Dockerfile index a88c0c983..5c503aa76 100644 --- a/linux/ecosystem/qbittorrent/Dockerfile +++ b/linux/ecosystem/qbittorrent/4.6.2/Dockerfile @@ -9,25 +9,21 @@ ENV QBT_DIR=/opt/qbittorrent ENV QBT_PORT_WEBUI=8282 ENV QBT_PORT_TRACKER=9000 ENV QBT_PORT_NAT=1337 +ENV QBT_VERSION=4.6.2 +ENV QBT_LIBTORRENT_VERSION=2.0.9 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox ################################################################## # Files and folders ################################################################## RUN mkdir -p ${QBT_DIR} -################################################################## -# qBitTorrent sources list -################################################################## -#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4 -#COPY qbittorrent-unstable.list /etc/apt/sources.list.d/qbittorrent-unstable.list -RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y - ############################# #################################### # qbittorrent install ################################################################## -RUN apt-get update && \ - apt install -y --allow-unauthenticated --allow-downgrades \ - qbittorrent-nox +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version ################################################################## # other customisations diff --git a/linux/ecosystem/qbittorrent/Dockerfile.stable b/linux/ecosystem/qbittorrent/4.6.2/Dockerfile.lt1 similarity index 75% rename from linux/ecosystem/qbittorrent/Dockerfile.stable rename to linux/ecosystem/qbittorrent/4.6.2/Dockerfile.lt1 index 88c840e7e..b5e5501e9 100644 --- a/linux/ecosystem/qbittorrent/Dockerfile.stable +++ b/linux/ecosystem/qbittorrent/4.6.2/Dockerfile.lt1 @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -9,25 +9,21 @@ ENV QBT_DIR=/opt/qbittorrent ENV QBT_PORT_WEBUI=8282 ENV QBT_PORT_TRACKER=9000 ENV QBT_PORT_NAT=1337 +ENV QBT_VERSION=4.6.2 +ENV QBT_LIBTORRENT_VERSION=1.2.19 +ENV QBT_URL=https://github.com/userdocs/qbittorrent-nox-static/releases/download/release-${QBT_VERSION}_v${QBT_LIBTORRENT_VERSION}/x86_64-qbittorrent-nox ################################################################## # Files and folders ################################################################## RUN mkdir -p ${QBT_DIR} -################################################################## -# qBitTorrent sources list -################################################################## -#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4 -#COPY qbittorrent-stable.list /etc/apt/sources.list.d/qbittorrent-stable.list -#RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y - ############################# #################################### # qbittorrent install ################################################################## -RUN apt-get update && \ - apt install -y --allow-unauthenticated --allow-downgrades \ - qbittorrent-nox +RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${QBT_URL} -O /usr/bin/qbittorrent-nox && \ + chmod +x /usr/bin/qbittorrent-nox && \ + qbittorrent-nox --version ################################################################## # other customisations diff --git a/linux/ecosystem/qbittorrent/Makefile b/linux/ecosystem/qbittorrent/4.6.2/Makefile similarity index 55% rename from linux/ecosystem/qbittorrent/Makefile rename to linux/ecosystem/qbittorrent/4.6.2/Makefile index 08fb19a2b..b414ac9d6 100644 --- a/linux/ecosystem/qbittorrent/Makefile +++ b/linux/ecosystem/qbittorrent/4.6.2/Makefile @@ -6,9 +6,8 @@ app: make clean build: - make qbt-latest - make qbt-unstable - make qbt-stable + make qbt-libtorrent2 + make qbt-libtorrent1 deploy: docker-compose push @@ -20,15 +19,10 @@ clean: docker volume prune -f docker system prune -af -qbt-latest: - docker-compose build --compress --parallel --progress plain qbt-latest - docker-compose push qbt-latest +qbt-libtorrent2: + docker-compose build --compress --parallel --progress plain qbt-libtorrent2 + docker-compose push qbt-libtorrent2 - -qbt-unstable: - docker-compose build --compress --parallel --progress plain qbt-unstable - docker-compose push qbt-unstable - -qbt-stable: - docker-compose build --compress --parallel --progress plain qbt-stable - docker-compose push qbt-stable +qbt-libtorrent1: + docker-compose build --compress --parallel --progress plain qbt-libtorrent1 + docker-compose push qbt-libtorrent1 diff --git a/linux/ecosystem/qbittorrent/README.md b/linux/ecosystem/qbittorrent/4.6.2/README.md similarity index 100% rename from linux/ecosystem/qbittorrent/README.md rename to linux/ecosystem/qbittorrent/4.6.2/README.md diff --git a/linux/ecosystem/qbittorrent/docker-compose.example.yml b/linux/ecosystem/qbittorrent/4.6.2/docker-compose.example.yml similarity index 100% rename from linux/ecosystem/qbittorrent/docker-compose.example.yml rename to linux/ecosystem/qbittorrent/4.6.2/docker-compose.example.yml diff --git a/linux/ecosystem/qbittorrent/4.6.2/docker-compose.yml b/linux/ecosystem/qbittorrent/4.6.2/docker-compose.yml new file mode 100644 index 000000000..a9f8d2cc6 --- /dev/null +++ b/linux/ecosystem/qbittorrent/4.6.2/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.9' +services: + qbt-libtorrent2: + image: "epicmorg/qbittorrent:4.6.2" + build: + context: . + qbt-libtorrent1: + image: "epicmorg/qbittorrent:4.6.2-libtorrent1.2.19" + build: + context: . + dockerfile: Dockerfile.lt1 diff --git a/linux/ecosystem/qbittorrent/docker-entrypoint.sh b/linux/ecosystem/qbittorrent/4.6.2/docker-entrypoint.sh similarity index 100% rename from linux/ecosystem/qbittorrent/docker-entrypoint.sh rename to linux/ecosystem/qbittorrent/4.6.2/docker-entrypoint.sh diff --git a/linux/ecosystem/qbittorrent/qbittorrent-icon.png b/linux/ecosystem/qbittorrent/4.6.2/qbittorrent-icon.png similarity index 100% rename from linux/ecosystem/qbittorrent/qbittorrent-icon.png rename to linux/ecosystem/qbittorrent/4.6.2/qbittorrent-icon.png diff --git a/linux/ecosystem/qbittorrent/docker-compose.yml b/linux/ecosystem/qbittorrent/docker-compose.yml deleted file mode 100644 index 3acac9281..000000000 --- a/linux/ecosystem/qbittorrent/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.9' -services: - qbt-latest: - image: "epicmorg/qbittorrent:latest" - build: - context: . - qbt-unstable: - image: "epicmorg/qbittorrent:unstable" - build: - context: . - qbt-stable: - image: "epicmorg/qbittorrent:stable" - build: - context: . - dockerfile: Dockerfile.stable \ No newline at end of file