From 5ff5d46ba555205986d2bea9487b854a634b2ff5 Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Sun, 19 Dec 2021 14:41:04 -0500
Subject: [PATCH] Cleanup dockerfiles

---
 scripts/Dockerfile-debian       | 27 ++++++++++++++++++++++++-
 scripts/Dockerfile-fedora_33    | 18 +++++++++++++++--
 scripts/Dockerfile-fedora_35    | 24 +++++++++++++++++++---
 scripts/Dockerfile-ubuntu_18_04 | 35 ++++++++++++++++++++++++++++-----
 scripts/Dockerfile-ubuntu_20_04 | 27 ++++++++++++++++++++++++-
 scripts/Dockerfile-ubuntu_21_04 | 27 ++++++++++++++++++++++++-
 scripts/Dockerfile-ubuntu_21_10 | 27 ++++++++++++++++++++++++-
 7 files changed, 171 insertions(+), 14 deletions(-)

diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian
index 253a4d45..0444edc7 100644
--- a/scripts/Dockerfile-debian
+++ b/scripts/Dockerfile-debian
@@ -6,7 +6,32 @@ ARG TZ="Europe/London"
 RUN echo deb http://deb.debian.org/debian/ bullseye main contrib non-free | tee /etc/apt/sources.list.d/non-free.list
 RUN apt-get update -y && \
     apt-get install -y \
-    git build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev nvidia-cuda-dev nvidia-cuda-toolkit
+                        build-essential \
+                        cmake \
+                        git \
+                        libavdevice-dev \
+                        libboost-thread-dev \
+                        libboost-filesystem-dev \
+                        libboost-log-dev \
+                        libcap-dev \
+                        libdrm-dev \
+                        libevdev-dev \
+                        libpulse-dev \
+                        libopus-dev \
+                        libssl-dev \
+                        libwayland-dev \
+                        libx11-dev \
+                        libxcb-shm0-dev \
+                        libxcb-xfixes0-dev \
+                        libxcb1-dev \
+                        libxfixes-dev \
+                        libxrandr-dev \
+                        libxtst-dev \
+                        nvidia-cuda-dev \
+                        nvidia-cuda-toolkit \
+    && \
+    apt-get clean && \
+    apt-get autoclean
 
 COPY build-private.sh /root/build.sh
 
diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33
index 793e64e4..03075d04 100644
--- a/scripts/Dockerfile-fedora_33
+++ b/scripts/Dockerfile-fedora_33
@@ -2,8 +2,22 @@ FROM fedora:33 AS sunshine-fedora_33
 
 RUN dnf -y update && \
     dnf -y group install "Development Tools" && \
-    dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
-    dnf -y install openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake
+    dnf -y install  https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
+                    boost-devel \
+                    boost-static.x86_64 \
+                    cmake \
+                    ffmpeg-devel \
+                    libevdev-devel \
+                    libxcb-devel \
+                    libX11-devel \
+                    libXfixes-devel \
+                    libXtst-devel \
+                    openssl-devel \
+                    opus-devel \
+                    pulseaudio-libs-devel \
+    && \
+    dnf clean all && \
+    rm -rf /var/cache/yum
 
 COPY build-private.sh /root/build.sh
 
diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35
index 80e39eec..04628c09 100644
--- a/scripts/Dockerfile-fedora_35
+++ b/scripts/Dockerfile-fedora_35
@@ -2,9 +2,27 @@ FROM fedora:33 AS sunshine-fedora_33
 
 RUN dnf -y update && \
     dnf -y group install "Development Tools" && \
-    dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
-    dnf -y install openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake && \
-    dnf -y install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel
+    dnf -y install  https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
+                    boost-devel \
+                    boost-static.x86_64 \
+                    cmake \
+                    ffmpeg-devel \
+                    libevdev-devel \
+                    libxcb-devel \
+                    libX11-devel \
+                    libXcursor-devel \
+                    libXfixes-devel \
+                    libXinerama-devel \
+                    libXi-devel \
+                    libXrandr-devel \
+                    libXtst-devel \
+                    mesa-libGL-devel \
+                    openssl-devel \
+                    opus-devel \
+                    pulseaudio-libs-devel \
+    && \
+    dnf clean all && \
+    rm -rf /var/cache/yum
 
 COPY build-private.sh /root/build.sh
 
diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04
index 2941a0b1..1b8ffd18 100644
--- a/scripts/Dockerfile-ubuntu_18_04
+++ b/scripts/Dockerfile-ubuntu_18_04
@@ -3,12 +3,37 @@ FROM ubuntu:18.04 AS sunshine-ubuntu_18_04
 ARG DEBIAN_FRONTEND=noninteractive 
 ARG TZ="Europe/London"
 
-RUN apt-get update -y && \
-    apt-get install -y \
-    git wget g++-10 build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev  && \
-    add-apt-repository ppa:ubuntu-toolchain-r/test && \
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt-get update -y && \
-    apt-get install -y gcc-10
+    apt-get install -y \
+                        build-essential \
+                        cmake \
+                        gcc-10
+                        git \
+                        g++-10 \
+                        libavdevice-dev \
+                        libboost-thread-dev \
+                        libboost-filesystem-dev \
+                        libboost-log-dev \
+                        libcap-dev \
+                        libdrm-dev \
+                        libevdev-dev \
+                        libpulse-dev \
+                        libopus-dev \
+                        libssl-dev \
+                        libwayland-dev \
+                        libx11-dev \
+                        libxcb-shm0-dev \
+                        libxcb-xfixes0-dev \
+                        libxcb1-dev \
+                        libxfixes-dev \
+                        libxrandr-dev \
+                        libxtst-dev \
+                        software-properties-common \
+                        wget \
+    && \
+    apt-get clean && \
+    apt-get autoclean
 
 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
 
diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04
index ea69f455..75169813 100644
--- a/scripts/Dockerfile-ubuntu_20_04
+++ b/scripts/Dockerfile-ubuntu_20_04
@@ -5,7 +5,32 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y \
-    git wget gcc-10 g++-10 build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev
+                        build-essential \
+                        cmake \
+                        git \
+                        g++-10 \
+                        libavdevice-dev \
+                        libboost-thread-dev \
+                        libboost-filesystem-dev \
+                        libboost-log-dev \
+                        libcap-dev \
+                        libdrm-dev \
+                        libevdev-dev \
+                        libpulse-dev \
+                        libopus-dev \
+                        libssl-dev \
+                        libwayland-dev \
+                        libx11-dev \
+                        libxcb-shm0-dev \
+                        libxcb-xfixes0-dev \
+                        libxcb1-dev \
+                        libxfixes-dev \
+                        libxrandr-dev \
+                        libxtst-dev \
+                        wget \
+    && \
+    apt-get clean && \
+    apt-get autoclean
 
 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
 
diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04
index 83c17483..1972e2be 100644
--- a/scripts/Dockerfile-ubuntu_21_04
+++ b/scripts/Dockerfile-ubuntu_21_04
@@ -5,7 +5,32 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y \
-    git build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev nvidia-cuda-dev nvidia-cuda-toolkit
+                        build-essential \
+                        cmake \
+                        git \
+                        libavdevice-dev \
+                        libboost-thread-dev \
+                        libboost-filesystem-dev \
+                        libboost-log-dev \
+                        libcap-dev \
+                        libdrm-dev \
+                        libevdev-dev \
+                        libpulse-dev \
+                        libopus-dev \
+                        libssl-dev \
+                        libwayland-dev \
+                        libx11-dev \
+                        libxcb-shm0-dev \
+                        libxcb-xfixes0-dev \
+                        libxcb1-dev \
+                        libxfixes-dev \
+                        libxrandr-dev \
+                        libxtst-dev \
+                        nvidia-cuda-dev \
+                        nvidia-cuda-toolkit \
+    && \
+    apt-get clean && \
+    apt-get autoclean
 
 COPY build-private.sh /root/build.sh
 
diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10
index a7f65f3b..d5fab928 100644
--- a/scripts/Dockerfile-ubuntu_21_10
+++ b/scripts/Dockerfile-ubuntu_21_10
@@ -5,7 +5,32 @@ ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
     apt-get install -y \
-    git build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev nvidia-cuda-dev nvidia-cuda-toolkit
+                        build-essential \
+                        cmake \
+                        git \
+                        libavdevice-dev \
+                        libboost-thread-dev \
+                        libboost-filesystem-dev \
+                        libboost-log-dev \
+                        libcap-dev \
+                        libdrm-dev \
+                        libevdev-dev \
+                        libpulse-dev \
+                        libopus-dev \
+                        libssl-dev \
+                        libwayland-dev \
+                        libx11-dev \
+                        libxcb-shm0-dev \
+                        libxcb-xfixes0-dev \
+                        libxcb1-dev \
+                        libxfixes-dev \
+                        libxrandr-dev \
+                        libxtst-dev \
+                        nvidia-cuda-dev \
+                        nvidia-cuda-toolkit \
+    && \
+    apt-get clean && \
+    apt-get autoclean
 
 COPY build-private.sh /root/build.sh