qBittorrent 4.4.1 and libtorrent-rasterbar 2.0.5 (#42)

Multi-platform image support

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>

Author: crazy-max

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
           echo ::set-output name=build_tag::test
           echo ::set-output name=container_name::qbittorrent
           echo ::set-output name=running_timeout::120
-          echo ::set-output name=running_log_check::access the Web UI at
+          echo ::set-output name=running_log_check::access the WebUI at
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

Dockerfile

@@ -1,60 +1,73 @@
-ARG LIBTORRENT_VERSION=1.2.14
-ARG QBITTORRENT_VERSION=4.3.8
+ARG QBITTORRENT_VERSION=4.4.1
+ARG LIBTORRENT_VERSION=2.0.5
+ARG XX_VERSION=1.1.0
 
-FROM crazymax/yasu:latest AS yasu
-FROM alpine:3.15 AS builder
-
-RUN apk add --update --no-cache \
-    autoconf \
-    automake \
-    binutils \
-    boost-dev \
-    build-base \
-    cppunit-dev \
-    git \
-    libtool \
-    linux-headers \
-    ncurses-dev \
-    openssl-dev \
-    zlib-dev \
-  && rm -rf /tmp/*
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
+FROM --platform=$BUILDPLATFORM alpine:3.15 AS base
+COPY --from=xx / /
+RUN apk --update --no-cache add git
 
+FROM base AS libtorrent-src
 ARG LIBTORRENT_VERSION
-RUN cd /tmp \
-  && git clone --branch v${LIBTORRENT_VERSION} --recurse-submodules https://github.com/arvidn/libtorrent.git \
-  && cd libtorrent \
-  && ./autotool.sh \
-  && ./configure CXXFLAGS="-std=c++14" --with-libiconv \
-  && make -j$(nproc) \
-  && make install-strip \
-  && ls -al /usr/local/lib/
-
-RUN apk add --update --no-cache \
-    qt5-qtbase \
-    qt5-qttools-dev \
-  && rm -rf /tmp/*
+WORKDIR /src
+RUN git clone --branch v${LIBTORRENT_VERSION} --recurse-submodules https://github.com/arvidn/libtorrent.git .
 
+FROM base AS qbittorrent-src
 ARG QBITTORRENT_VERSION
-RUN cd /tmp \
-  && git clone --branch release-${QBITTORRENT_VERSION} https://github.com/qbittorrent/qBittorrent.git \
-  && cd qBittorrent \
-  && ./configure --disable-gui \
-  && make -j$(nproc) \
-  && make install \
-  && ls -al /usr/local/bin/ \
-  && qbittorrent-nox --help
+WORKDIR /src
+RUN git clone --branch release-${QBITTORRENT_VERSION} --shallow-submodules --recurse-submodules https://github.com/qbittorrent/qBittorrent.git .
+
+FROM base AS build
+RUN apk --update --no-cache add binutils clang cmake libtool linux-headers ninja perl pkgconf tree
 
+COPY --from=libtorrent-src /src /src/libtorrent
+WORKDIR /src/libtorrent
+ARG TARGETPLATFORM
+RUN xx-apk --no-cache --no-scripts add gcc g++ boost-dev cppunit-dev ncurses-dev openssl-dev python3-dev py3-numpy-dev zlib-dev
+RUN export QEMU_LD_PREFIX=$(xx-info sysroot) \
+  && cmake -Wno-dev -G Ninja -B build $(xx-clang --print-cmake-defines) \
+    -DCMAKE_SYSROOT="$(xx-info sysroot)" \
+    -DCMAKE_CXX_FLAGS="-w -s" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DCMAKE_CXX_STANDARD=17 \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    -DCMAKE_INSTALL_PREFIX="$(xx-info sysroot)usr/local" \
+  && cmake --build build --verbose \
+  && cmake --install build
+
+COPY --from=qbittorrent-src /src /src/qbittorrent
+WORKDIR /src/qbittorrent
+RUN xx-apk --no-cache --no-scripts add icu-dev libexecinfo-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtsvg-dev
+RUN export QEMU_LD_PREFIX=$(xx-info sysroot) \
+  && cmake -Wno-dev -G Ninja -B build $(xx-clang --print-cmake-defines) \
+    -DGUI=OFF \
+    -DCMAKE_SYSROOT="$(xx-info sysroot)" \
+    -DCMAKE_CXX_FLAGS="-w -s" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DCMAKE_CXX_STANDARD=17 \
+    -DCMAKE_CXX_STANDARD_LIBRARIES="$(xx-info sysroot)usr/lib/libexecinfo.so.1" \
+    -DCMAKE_INSTALL_PREFIX="$(xx-info sysroot)usr/local" \
+  && cmake --build build --verbose \
+  && cmake --install build
+
+RUN mkdir -p /out/usr/local/bin /out/usr/local/lib \
+  && cp $(xx-info sysroot)usr/local/lib/libtorrent-rasterbar.so* /out/usr/local/lib/ \
+  && cp $(xx-info sysroot)usr/local/bin/qbittorrent-nox /out/usr/local/bin/
+
+FROM crazymax/yasu:latest AS yasu
 FROM alpine:3.15
 
 COPY --from=yasu / /
-COPY --from=builder /usr/local/lib/libtorrent-rasterbar.so.10.0.0 /usr/lib/libtorrent-rasterbar.so.10
-COPY --from=builder /usr/local/bin/qbittorrent-nox /usr/bin/qbittorrent-nox
+COPY --from=build /out /
 
 RUN apk --update --no-cache add \
     bind-tools \
     curl \
+    icu \
+    libexecinfo \
     openssl \
     qt5-qtbase \
+    qt5-qtsvg \
     shadow \
     tzdata \
     unzip \
@@ -72,14 +85,15 @@ COPY entrypoint.sh /entrypoint.sh
 RUN chmod a+x /entrypoint.sh \
   && addgroup -g ${PGID} qbittorrent \
   && adduser -D -h ${QBITTORRENT_HOME} -u ${PUID} -G qbittorrent -s /bin/sh qbittorrent \
-  && qbittorrent-nox --version
+  && qbittorrent-nox --version \
+  && uname -a
 
 EXPOSE 6881 6881/udp ${WEBUI_PORT}
 WORKDIR /data
 VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/usr/bin/qbittorrent-nox" ]
+CMD [ "/usr/local/bin/qbittorrent-nox" ]
 
 HEALTHCHECK --interval=10s --timeout=10s --start-period=20s \
   CMD curl --fail http://127.0.0.1:${WEBUI_PORT}/api/v2/app/version || exit 1

README.md

@@ -38,6 +38,7 @@ ___
 ## Features
 
 * Run as non-root user
+* Multi-platform image
 * Latest [qBittorrent](https://github.com/qbittorrent/qBittorrent) / [libtorrent-rasterbar](https://github.com/arvidn/libtorrent) release compiled from source
 * WAN IP address automatically resolved for reporting to the tracker
 * Finished torrents automatically saved to `/data/torrents`
@@ -67,6 +68,19 @@ docker buildx bake image-all
 | [Docker Hub](https://hub.docker.com/r/crazymax/qbittorrent/)                                            | `crazymax/qbittorrent`                 |
 | [GitHub Container Registry](https://github.com/users/crazy-max/packages/container/package/qbittorrent)  | `ghcr.io/crazy-max/qbittorrent`        |
 
+Following platforms for this image are available:
+
+```
+$ docker run --rm mplatform/mquery crazymax/qbittorrent:latest
+Image: crazymax/qbittorrent:latest
+ * Manifest List: Yes
+ * Supported platforms:
+   - linux/amd64
+   - linux/arm/v6
+   - linux/arm/v7
+   - linux/arm64
+```
+
 ## Environment variables
 
 * `TZ`: Timezone assigned to the container (default `UTC`)

docker-bake.hcl

@@ -24,6 +24,9 @@ target "image-local" {
 target "image-all" {
   inherits = ["image"]
   platforms = [
-    "linux/amd64"
+    "linux/amd64",
+    "linux/arm/v6",
+    "linux/arm/v7",
+    "linux/arm64"
   ]
 }