From 0fce2935565fab22451c267e0b1bef761033ec03 Mon Sep 17 00:00:00 2001
From: DyonR <DyonR@users.noreply.github.com>
Date: Thu, 25 Mar 2021 21:30:35 +0100
Subject: [PATCH] Switch to Ubuntu 20.04 for higher qtbase5 version

Debian 10 only provides qtbase5-dev 5.11, while 5.12 is the minimum required for compiling qBittorrent, Ubuntu 20.04 provides version 5.12.8.
---
 Dockerfile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a4108d..f6382b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10-slim
+FROM ubuntu:20.04
 
 WORKDIR /opt
 
@@ -9,8 +9,8 @@ RUN mkdir -p /downloads /config/qBittorrent /etc/openvpn /etc/qbittorrent
 
 # Install boost
 RUN apt update \
-    && apt -y upgrade \
-    && apt -y install --no-install-recommends \
+    && apt upgrade -y \
+    && apt install -y --no-install-recommends \
     curl \
     ca-certificates \
     g++ \
@@ -24,13 +24,13 @@ RUN apt update \
     && ./b2 --prefix=/usr install \
     && cd /opt \
     && rm -rf /opt/* \
-    && apt -y purge \
+    && apt purge -y \
     curl \
     ca-certificates \
     g++ \
     libxml2-utils \
     && apt-get clean \
-    && apt -y autoremove \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -45,7 +45,7 @@ RUN apt update \
     jq \
     unzip \
     && NINJA_ASSETS=$(curl -sX GET "https://api.github.com/repos/ninja-build/ninja/releases" | jq '.[] | select(.prerelease==false) | .assets_url' | head -n 1 | tr -d '"') \
-    && NINJA_DOWNLOAD_URL=$(curl -sX GET ${NINJA_ASSETS} | jq '.[] | select(.name | contains("ninja-linux")) .browser_download_url' | tr -d '"') \
+    && NINJA_DOWNLOAD_URL=$(curl -sX GET ${NINJA_ASSETS} | jq '.[] | select(.name | match("ninja-linux";"i")) .browser_download_url' | tr -d '"') \
     && curl -o /opt/ninja-linux.zip -L ${NINJA_DOWNLOAD_URL} \
     && unzip /opt/ninja-linux.zip -d /opt \
     && mv /opt/ninja /usr/local/bin/ninja \
@@ -57,7 +57,7 @@ RUN apt update \
     jq \
     unzip \
     && apt-get clean \
-    && apt autoremove -y \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -66,7 +66,7 @@ RUN apt update \
 # Install cmake
 RUN apt update \
     && apt upgrade -y \
-    && apt install -y  --no-install-recommends \
+    && apt install -y --no-install-recommends \
     ca-certificates \
     curl \
     jq \
@@ -81,7 +81,7 @@ RUN apt update \
     curl \
     jq \
     && apt-get clean \
-    && apt autoremove -y \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -115,7 +115,7 @@ RUN apt update \
     jq \
     libssl-dev \
     && apt-get clean \
-    && apt autoremove -y \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -152,7 +152,7 @@ RUN apt update \
     qttools5-dev \
     zlib1g-dev \
     && apt-get clean \
-    && apt autoremove -y \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -179,7 +179,7 @@ RUN echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.li
     procps \
     wireguard-tools \
     && apt-get clean \
-    && apt autoremove -y \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \
@@ -190,13 +190,13 @@ RUN echo "deb http://deb.debian.org/debian/ buster non-free" > /etc/apt/sources.
     && printf 'Package: *\nPin: release a=non-free\nPin-Priority: 150\n' > /etc/apt/preferences.d/limit-non-free \
     && apt update \
     && apt -y upgrade \
-    && apt -y install --no-install-recommends \
+    && apt install -y --no-install-recommends \
     unrar \
     p7zip-full \
     unzip \
     zip \
     && apt-get clean \
-    && apt -y autoremove \
+    && apt autoremove -y --purge \
     && rm -rf \
     /var/lib/apt/lists/* \
     /tmp/* \