Cleanup dockerfiles

scripts/Dockerfile-debian

@@ -3,9 +3,10 @@ FROM debian:bullseye AS sunshine-debian
 ARG DEBIAN_FRONTEND=noninteractive 
 ARG TZ="Europe/London"
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 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 \
+    apt-get install -y --no-install-recommends \
                         build-essential \
                         cmake \
                         git \
@@ -29,9 +30,8 @@ RUN apt-get update -y && \
                         libxtst-dev \
                         nvidia-cuda-dev \
                         nvidia-cuda-toolkit \
-    && \
+    && apt-get clean \
-    apt-get clean && \
+    && rm -rf /var/lib/apt/lists/*
-    apt-get autoclean
 
 COPY build-private.sh /root/build.sh
 

scripts/Dockerfile-fedora_33

@@ -15,9 +15,8 @@ RUN dnf -y update && \
                     openssl-devel \
                     opus-devel \
                     pulseaudio-libs-devel \
-    && \
+    && dnf clean all \
-    dnf clean all && \
+    && rm -rf /var/cache/yum
-    rm -rf /var/cache/yum
 
 COPY build-private.sh /root/build.sh
 

scripts/Dockerfile-fedora_35

@@ -20,9 +20,8 @@ RUN dnf -y update && \
                     openssl-devel \
                     opus-devel \
                     pulseaudio-libs-devel \
-    && \
+    && dnf clean all \
-    dnf clean all && \
+    && rm -rf /var/cache/yum
-    rm -rf /var/cache/yum
 
 COPY build-private.sh /root/build.sh
 

scripts/Dockerfile-ubuntu_18_04

@@ -5,10 +5,10 @@ ARG TZ="Europe/London"
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt-get update -y && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
                         build-essential \
                         cmake \
-                        gcc-10
+                        gcc-10 \
                         git \
                         g++-10 \
                         libavdevice-dev \
@@ -31,9 +31,8 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
                         libxtst-dev \
                         software-properties-common \
                         wget \
-    && \
+    && apt-get clean \
-    apt-get clean && \
+    && rm -rf /var/lib/apt/lists/*
-    apt-get autoclean
 
 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
 

scripts/Dockerfile-ubuntu_20_04

@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
                         build-essential \
                         cmake \
                         git \
@@ -28,9 +28,8 @@ RUN apt-get update -y && \
                         libxrandr-dev \
                         libxtst-dev \
                         wget \
-    && \
+    && apt-get clean \
-    apt-get clean && \
+    && rm -rf /var/lib/apt/lists/*
-    apt-get autoclean
 
 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
 

scripts/Dockerfile-ubuntu_21_04

@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
                         build-essential \
                         cmake \
                         git \
@@ -28,9 +28,8 @@ RUN apt-get update -y && \
                         libxtst-dev \
                         nvidia-cuda-dev \
                         nvidia-cuda-toolkit \
-    && \
+    && apt-get clean \
-    apt-get clean && \
+    && rm -rf /var/lib/apt/lists/*
-    apt-get autoclean
 
 COPY build-private.sh /root/build.sh
 

scripts/Dockerfile-ubuntu_21_10

@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG TZ="Europe/London"
 
 RUN apt-get update -y && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
                         build-essential \
                         cmake \
                         git \
@@ -28,9 +28,8 @@ RUN apt-get update -y && \
                         libxtst-dev \
                         nvidia-cuda-dev \
                         nvidia-cuda-toolkit \
-    && \
+    && apt-get clean \
-    apt-get clean && \
+    && rm -rf /var/lib/apt/lists/*
-    apt-get autoclean
 
 COPY build-private.sh /root/build.sh