Compare commits

...

2 Commits

Author SHA1 Message Date
DyonR
2d63e8e4fd
Merge pull request from DyonR/dev
Setting ENABLE_SSL to NOT yes, true or 1 disables HTTPS
2022-02-20 01:37:19 +01:00
DyonR
db03b8cd0a Qt6 test branche 2022-02-20 01:15:27 +01:00

@ -133,15 +133,21 @@ RUN apt update \
jq \ jq \
libssl-dev \ libssl-dev \
pkg-config \ pkg-config \
qtbase5-dev \
qttools5-dev \
zlib1g-dev \ zlib1g-dev \
&& echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list \
&& printf 'Package: *\nPin: release a=unstable\nPin-Priority: 150\n' > /etc/apt/preferences.d/limit-unstable \
&& apt update \
&& apt install -y --no-install-recommends -t unstable \
qt6-base-dev \
qt6-tools-dev \
qt6-l10n-tools \
qt6-tools-dev-tools \
&& QBITTORRENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/qBittorrent/qBittorrent/tags" | jq '.[] | select(.name | index ("beta") | not) | select(.name | index ("rc") | not) | .name' | head -n 1 | tr -d '"') \ && QBITTORRENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/qBittorrent/qBittorrent/tags" | jq '.[] | select(.name | index ("beta") | not) | select(.name | index ("rc") | not) | .name' | head -n 1 | tr -d '"') \
&& curl -o /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz -L "https://github.com/qbittorrent/qBittorrent/archive/${QBITTORRENT_RELEASE}.tar.gz" \ && 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 \ && tar -xzf /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \
&& rm /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \ && rm /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \
&& cd /opt/qBittorrent-${QBITTORRENT_RELEASE} \ && cd /opt/qBittorrent-${QBITTORRENT_RELEASE} \
&& cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DGUI=OFF -DCMAKE_CXX_STANDARD=17 \ && cmake -G Ninja -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DGUI=OFF -DCMAKE_CXX_STANDARD=17 -DQT6=ON \
&& cmake --build build --parallel $(nproc) \ && cmake --build build --parallel $(nproc) \
&& cmake --install build \ && cmake --install build \
&& cd /opt \ && cd /opt \
@ -154,8 +160,10 @@ RUN apt update \
jq \ jq \
libssl-dev \ libssl-dev \
pkg-config \ pkg-config \
qtbase5-dev \ qt6-base-dev \
qttools5-dev \ qt6-tools-dev \
qt6-l10n-tools \
qt6-tools-dev-tools \
zlib1g-dev \ zlib1g-dev \
&& apt-get clean \ && apt-get clean \
&& apt --purge autoremove -y \ && apt --purge autoremove -y \
@ -165,9 +173,7 @@ RUN apt update \
/var/tmp/* /var/tmp/*
# Install WireGuard and some other dependencies some of the scripts in the container rely on. # Install WireGuard and some other dependencies some of the scripts in the container rely on.
RUN echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable-wireguard.list \ RUN apt update \
&& printf 'Package: *\nPin: release a=unstable\nPin-Priority: 150\n' > /etc/apt/preferences.d/limit-unstable \
&& apt update \
&& apt install -y --no-install-recommends \ && apt install -y --no-install-recommends \
ca-certificates \ ca-certificates \
dos2unix \ dos2unix \
@ -175,9 +181,9 @@ RUN echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.li
ipcalc \ ipcalc \
iptables \ iptables \
kmod \ kmod \
libqt5network5 \ libqt6network6 \
libqt5xml5 \ libqt6xml6 \
libqt5sql5 \ libqt6sql6 \
libssl1.1 \ libssl1.1 \
moreutils \ moreutils \
net-tools \ net-tools \