From eec1215c8fe364a8a1411b86d58e8ce4bc457b80 Mon Sep 17 00:00:00 2001
From: Mogeko <zhengjunyi@live.com>
Date: Fri, 19 Nov 2021 21:49:50 +0000
Subject: [PATCH] feat: get the source code from Git

---
 Dockerfile | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea255a8..4b19bb1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,35 +1,29 @@
 FROM alpine:3.14 as libtorrent_builder
 
-RUN apk add --no-cache \
-    autoconf automake binutils boost-dev cppunit-dev libtool linux-headers ncurses-dev openssl-dev zlib-dev \
-    build-base clang tar
+RUN apk add --no-cache autoconf automake boost-dev build-base clang-dev libtool openssl-dev git
 
 WORKDIR /workspace
 
 ARG LIBTORRENT_VERSION
-ADD https://github.com/arvidn/libtorrent/archive/refs/tags/v${LIBTORRENT_VERSION}.tar.gz /workspace
-RUN tar -zxf v${LIBTORRENT_VERSION}.tar.gz -C . \
-    && cd libtorrent-${LIBTORRENT_VERSION} \
-    && ./autotool.sh \
+ARG LIBTORRENT_GIT=https://github.com/arvidn/libtorrent.git
+RUN git clone --depth 1 --recurse-submodules -b v${LIBTORRENT_VERSION} ${LIBTORRENT_GIT} .
+RUN ./autotool.sh \
     && ./configure CXXFLAGS="-std=c++14" --prefix=/workspace/pkg --with-libiconv \
     && CC=clang make -j$(nproc) \
     && make install-strip
 
 FROM alpine:3.14 as qbittorrent_builder
 
-RUN apk add --no-cache \
-    boost-dev qt5-qtbase-dev qt5-qttools-dev \
-    build-base clang tar
-
-WORKDIR /workspace
+RUN apk add --no-cache boost-dev qt5-qtbase-dev qt5-qttools-dev build-base clang git
 
 COPY --from=libtorrent_builder /workspace/pkg /usr
 
+WORKDIR /workspace
+
 ARG QBITTORRENT_VERSION
-ADD https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-${QBITTORRENT_VERSION}.tar.gz /workspace
-RUN tar -zxf release-${QBITTORRENT_VERSION}.tar.gz -C . \
-    && cd qBittorrent-release-${QBITTORRENT_VERSION} \
-    && ./configure --prefix=/workspace/pkg --disable-gui \
+ARG QBITTORRENT_GIT=https://github.com/qbittorrent/qBittorrent.git
+RUN git clone --depth 1 --recurse-submodules -b release-${QBITTORRENT_VERSION} ${QBITTORRENT_GIT} .
+RUN ./configure --prefix=/workspace/pkg --disable-gui \
     && CC=clang make -j$(nproc) \
     && make install
 
@@ -37,8 +31,8 @@ FROM alpine:3.14
 
 RUN apk add --no-cache busybox libgcc openssl qt5-qtbase zlib
 
-COPY --from=libtorrent_builder /workspace/pkg /usr
 COPY --from=qbittorrent_builder /workspace/pkg /usr
+COPY --from=libtorrent_builder /workspace/pkg /usr
 
 ADD --chown=1000:100 root /