Merge branch 'alpha' into dev

This commit is contained in:
DyonR 2021-01-23 19:48:01 +01:00 committed by GitHub
commit 96ca325133
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -129,17 +129,13 @@ RUN apt update \
ca-certificates \
curl \
git \
jq \
libssl-dev \
pkg-config \
qtbase5-dev \
qttools5-dev \
zlib1g-dev \
&& QBITTORRENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/qBittorrent/qBittorrent/tags" | jq '.[0] .name' | tr -d '"') \
&& curl -o /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz -L "https://github.com/qbittorrent/qBittorrent/archive/${QBITTORRENT_RELEASE}.tar.gz" \
&& tar -xzf /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \
&& rm /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \
&& cd /opt/qBittorrent-${QBITTORRENT_RELEASE} \
&& git clone https://github.com/qbittorrent/qBittorrent.git /opt/qBittorrent \
&& cd /opt/qBittorrent \
&& cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DGUI=OFF -DCMAKE_CXX_STANDARD=17 \
&& cmake --build build --parallel $(nproc) \
&& cmake --install build \
@ -150,7 +146,6 @@ RUN apt update \
ca-certificates \
curl \
git \
jq \
libssl-dev \
pkg-config \
qtbase5-dev \
@ -217,4 +212,4 @@ RUN chmod +x /etc/qbittorrent/*.sh /etc/qbittorrent/*.init /etc/openvpn/*.sh
EXPOSE 8080
EXPOSE 8999
EXPOSE 8999/udp
CMD ["/bin/bash", "/etc/openvpn/start.sh"]
CMD ["/bin/bash", "/etc/openvpn/start.sh"]