qBittorrent:5.0.3 qee:5.0.2.10

.github/workflows/qBittorrent.yml

@@ -4,6 +4,8 @@ on:
   push:
     paths:
     - 'qBittorrent/Dockerfile'
+    - 'qBittorrent/Dockerfile.qb'
+    - 'qBittorrent/Dockerfile.qbee'
     - 'qBittorrent/root/**'
   workflow_dispatch:
 
@@ -17,8 +19,103 @@ jobs:
 
       - name: 'Set env'
         run: |
-          echo "QBITTORRENT_VER=$(echo `grep -n "QBITTORRENT_VER=" qBittorrent/Dockerfile`|awk -F= '{print $3}')" >> $GITHUB_ENV
-          echo "QBITTORRENT_EE_VER=$(echo `grep -n "QBITTORRENT_EE_VER=" qBittorrent/Dockerfile`|awk -F= '{print $3}')" >> $GITHUB_ENV
+          echo "QBITTORRENT_VER=$(echo `grep -n "QBITTORRENT_VER=" qBittorrent/Dockerfile.qb`|awk -F= '{print $2}')" >> $GITHUB_ENV
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check image exist
+        id: qb-check-step
+        run: |
+          if [ `DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect ghcr.io/gshang2017/qbittorrent-nox:${{ env.QBITTORRENT_VER }} > /dev/null  2>&1; echo $?` == "0" ];then echo "skipnext=true" >> $GITHUB_OUTPUT;fi
+
+      - name: Build and push
+        if : ( steps.qb-check-step.outputs.skipnext  != 'true' )
+        uses: docker/build-push-action@v6
+        with:
+          context: ./qBittorrent
+          file: ./qBittorrent/Dockerfile.qb
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ghcr.io/gshang2017/qbittorrent-nox:latest
+            ghcr.io/gshang2017/qbittorrent-nox:${{ env.QBITTORRENT_VER }}
+
+  job2:
+    name: buildx tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: 'Set env'
+        run: |
+          echo "QBITTORRENT_EE_VER=$(echo `grep -n "QBITTORRENT_EE_VER=" qBittorrent/Dockerfile.qbee`|awk -F= '{print $2}')" >> $GITHUB_ENV
+
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check image exist
+        id: qbee-check-step
+        run: |
+          if [ `DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect ghcr.io/gshang2017/qbittorrentee-nox:${{ env.QBITTORRENT_EE_VER }} > /dev/null  2>&1; echo $?` == "0" ];then echo "skipnext=true" >> $GITHUB_OUTPUT;fi
+
+      - name: Build and push
+        if : ( steps.qbee-check-step.outputs.skipnext  != 'true' )
+        uses: docker/build-push-action@v6
+        with:
+          context: ./qBittorrent
+          file: ./qBittorrent/Dockerfile.qbee
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: |
+            ghcr.io/gshang2017/qbittorrentee-nox:latest
+            ghcr.io/gshang2017/qbittorrentee-nox:${{ env.QBITTORRENT_EE_VER }}
+
+  job3:
+    needs: [job1, job2]
+    name: buildx tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: 'Set env'
+        run: |
+          echo "QBITTORRENT_VER=$(echo `grep -n "QBITTORRENT_VER=" qBittorrent/Dockerfile.qb`|awk -F= '{print $2}')" >> $GITHUB_ENV
+          echo "QBITTORRENT_EE_VER=$(echo `grep -n "QBITTORRENT_EE_VER=" qBittorrent/Dockerfile.qbee`|awk -F= '{print $2}')" >> $GITHUB_ENV
 
       - name: Set up QEMU
         id: qemu

qBittorrent/Dockerfile

@@ -1,68 +1,11 @@
 #compiling qB
-FROM ghcr.io/gshang2017/libtorrent:1 as compilingqB
-
-ARG QBITTORRENT_VER=5.0.2
-ARG QBITTORRENT_EE_VER=5.0.2.10
-
-RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
-#qBittorrent-Enhanced-Edition
-&& mkdir -p /tmp/qbbuild \
-&& wget -P /tmp/qbbuild https://github.com/c0re100/qBittorrent-Enhanced-Edition/archive/release-${QBITTORRENT_EE_VER}.zip \
-&& unzip -q /tmp/qbbuild/release-${QBITTORRENT_EE_VER}.zip -d /tmp/qbbuild \
-&& cd /tmp/qbbuild/qBittorrent-Enhanced-Edition-release-${QBITTORRENT_EE_VER} \
-&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
-&& cmake --build build-nox -j $(nproc) \
-&& cmake --install build-nox \
-&& strip /usr/local/bin/qbittorrent-nox \
-&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrentee-nox \
-#qBittorrent
-&& wget -P /tmp/qbbuild https://github.com/qbittorrent/qBittorrent/archive/release-${QBITTORRENT_VER}.zip \
-&& unzip -q /tmp/qbbuild/release-${QBITTORRENT_VER}.zip -d /tmp/qbbuild \
-&& cd /tmp/qbbuild/qBittorrent-release-${QBITTORRENT_VER} \
-&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
-&& cmake --build build-nox -j $(nproc) \
-&& cmake --install build-nox \
-&& strip /usr/local/bin/qbittorrent-nox \
-&& mkdir /qbittorrent \
-&& cp --parents /usr/local/bin/qbittorrent-nox /qbittorrent \
-&& cp --parents /usr/local/bin/qbittorrentee-nox /qbittorrent \
-&& if [ -e /usr/lib/libtorrent-rasterbar.so.2.0 ];then cp --parents /usr/lib/libtorrent-rasterbar.so.2.0 /qbittorrent; fi \
-&& if [ -e /usr/lib/libtorrent-rasterbar.so.10 ];then cp --parents /usr/lib/libtorrent-rasterbar.so.10 /qbittorrent; fi
+FROM ghcr.io/gshang2017/qbittorrent-nox:latest as compilingqB
 
 #compiling qB2
-FROM ghcr.io/gshang2017/libtorrent:2 as compilingqB2
-
-ARG QBITTORRENT_VER=5.0.2
-ARG QBITTORRENT_EE_VER=5.0.2.10
-
-RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
-#qBittorrent-Enhanced-Edition
-&& mkdir -p /tmp/qbbuild \
-&& wget -P /tmp/qbbuild https://github.com/c0re100/qBittorrent-Enhanced-Edition/archive/release-${QBITTORRENT_EE_VER}.zip \
-&& unzip -q /tmp/qbbuild/release-${QBITTORRENT_EE_VER}.zip -d /tmp/qbbuild \
-&& cd /tmp/qbbuild/qBittorrent-Enhanced-Edition-release-${QBITTORRENT_EE_VER} \
-&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
-&& cmake --build build-nox -j $(nproc) \
-&& cmake --install build-nox \
-&& strip /usr/local/bin/qbittorrent-nox \
-&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrentee2-nox \
-#qBittorrent
-&& wget -P /tmp/qbbuild https://github.com/qbittorrent/qBittorrent/archive/release-${QBITTORRENT_VER}.zip \
-&& unzip -q /tmp/qbbuild/release-${QBITTORRENT_VER}.zip -d /tmp/qbbuild \
-&& cd /tmp/qbbuild/qBittorrent-release-${QBITTORRENT_VER} \
-&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
-&& cmake --build build-nox -j $(nproc) \
-&& cmake --install build-nox \
-&& strip /usr/local/bin/qbittorrent-nox \
-&& mkdir /qbittorrent \
-&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrent2-nox \
-&& cp --parents /usr/local/bin/qbittorrent2-nox /qbittorrent \
-&& cp --parents /usr/local/bin/qbittorrentee2-nox /qbittorrent \
-&& if [ -e /usr/lib/libtorrent-rasterbar.so.2.0 ];then cp --parents /usr/lib/libtorrent-rasterbar.so.2.0 /qbittorrent; fi \
-&& if [ -e /usr/lib/libtorrent-rasterbar.so.10 ];then cp --parents /usr/lib/libtorrent-rasterbar.so.10 /qbittorrent; fi
+FROM ghcr.io/gshang2017/qbittorrentee-nox:latest as compilingqB2
 
 # docker qB
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG S6_VER=3.2.0.2
 

qBittorrent/Dockerfile.qb

@@ -0,0 +1,44 @@
+#compiling qB
+FROM ghcr.io/gshang2017/libtorrent:1 as compilingqB
+
+ARG QBITTORRENT_VER=5.0.3
+
+RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
+&& mkdir -p /tmp/qbbuild \
+&& mkdir /qbittorrent \
+&& cp --parents /usr/lib/libtorrent-rasterbar.so.10 /qbittorrent \
+#qBittorrent
+&& wget -O /tmp/qbbuild/qbittorrent.zip https://github.com/qbittorrent/qBittorrent/archive/release-${QBITTORRENT_VER}.zip \
+&& unzip -q /tmp/qbbuild/qbittorrent.zip -d /tmp/qbbuild \
+&& cd /tmp/qbbuild/qBittorrent-release* \
+&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
+&& cmake --build build-nox -j $(nproc) \
+&& cmake --install build-nox \
+&& strip /usr/local/bin/qbittorrent-nox \
+&& cp --parents /usr/local/bin/qbittorrent-nox /qbittorrent
+
+
+#compiling qB2
+FROM ghcr.io/gshang2017/libtorrent:2 as compilingqB2
+
+COPY --from=compilingqB /tmp/qbbuild/qbittorrent.zip /tmp/qbbuild/qbittorrent.zip
+
+RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
+&& mkdir /qbittorrent \
+&& cp --parents /usr/lib/libtorrent-rasterbar.so.2.0 /qbittorrent \
+#qBittorrent
+&& unzip -q /tmp/qbbuild/qbittorrent.zip -d /tmp/qbbuild \
+&& cd /tmp/qbbuild/qBittorrent-release* \
+&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
+&& cmake --build build-nox -j $(nproc) \
+&& cmake --install build-nox \
+&& strip /usr/local/bin/qbittorrent-nox \
+&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrent2-nox \
+&& cp --parents /usr/local/bin/qbittorrent2-nox /qbittorrent
+
+
+# docker qB-nox qBee-nox
+FROM alpine:3.21
+
+COPY --from=compilingqB --chmod=755 /qbittorrent /qbittorrent
+COPY --from=compilingqB2 --chmod=755 /qbittorrent /qbittorrent

qBittorrent/Dockerfile.qbee

@@ -0,0 +1,45 @@
+#compiling qB
+FROM ghcr.io/gshang2017/libtorrent:1 as compilingqB
+
+ARG QBITTORRENT_EE_VER=5.0.2.10
+
+RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
+&& mkdir -p /tmp/qbbuild \
+&& mkdir /qbittorrent \
+&& cp --parents /usr/lib/libtorrent-rasterbar.so.10 /qbittorrent \
+#qBittorrent-Enhanced-Edition
+&& wget -O /tmp/qbbuild/qbittorrent.zip https://github.com/c0re100/qBittorrent-Enhanced-Edition/archive/release-${QBITTORRENT_EE_VER}.zip \
+&& unzip -q /tmp/qbbuild/qbittorrent.zip -d /tmp/qbbuild \
+&& cd /tmp/qbbuild/qBittorrent-Enhanced-Edition-release* \
+&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
+&& cmake --build build-nox -j $(nproc) \
+&& cmake --install build-nox \
+&& strip /usr/local/bin/qbittorrent-nox \
+&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrentee-nox \
+&& cp --parents /usr/local/bin/qbittorrentee-nox /qbittorrent
+
+
+#compiling qB2
+FROM ghcr.io/gshang2017/libtorrent:2 as compilingqB2
+
+COPY --from=compilingqB /tmp/qbbuild/qbittorrent.zip /tmp/qbbuild/qbittorrent.zip
+
+RUN apk add --no-cache ca-certificates cmake build-base boost-dev wget samurai qt6-qttools-dev \
+&& mkdir /qbittorrent \
+&& cp --parents /usr/lib/libtorrent-rasterbar.so.2.0 /qbittorrent \
+#qBittorrent-Enhanced-Edition
+&& unzip -q /tmp/qbbuild/qbittorrent.zip -d /tmp/qbbuild \
+&& cd /tmp/qbbuild/qBittorrent-Enhanced-Edition-release* \
+&& cmake -B build-nox -G Ninja -DCMAKE_BUILD_TYPE=Release -DSTACKTRACE=OFF -DQT6=ON -DGUI=OFF \
+&& cmake --build build-nox -j $(nproc) \
+&& cmake --install build-nox \
+&& strip /usr/local/bin/qbittorrent-nox \
+&& mv /usr/local/bin/qbittorrent-nox /usr/local/bin/qbittorrentee2-nox \
+&& cp --parents /usr/local/bin/qbittorrentee2-nox /qbittorrent
+
+
+# docker qB-nox qBee-nox
+FROM alpine:3.21
+
+COPY --from=compilingqB --chmod=755 /qbittorrent /qbittorrent
+COPY --from=compilingqB2 --chmod=755 /qbittorrent /qbittorrent

qBittorrent/README.md

@@ -14,7 +14,7 @@
 
 |名称|版本|说明|
 |:-|:-|:-|
-|qBittorrent-qBittorrentEE|5.0.2-5.0.2.10|(amd64;arm64v8;arm32v7) 集成Trackers自动更新|
+|qBittorrent-qBittorrentEE|5.0.3-5.0.2.10|(amd64;arm64v8;arm32v7) 集成Trackers自动更新|
 
 #### 版本升级注意：