From 8349dcf164583fe0708c5a9501eb9d964ac57748 Mon Sep 17 00:00:00 2001
From: Pratik raj <rajpratik71@gmail.com>
Date: Wed, 7 Oct 2020 09:50:17 +0530
Subject: [PATCH] optimization debian package manager tweaks

By default, Ubuntu or Debian based "apt" or "apt-get" system installs recommended but not suggested packages .

By passing "--no-install-recommends" option, the user lets apt-get know not to consider recommended packages as a dependency to install.

This results in smaller downloads and installation of packages .

Refer to blog at [Ubuntu Blog](https://ubuntu.com/blog/we-reduced-our-docker-images-by-60-with-no-install-recommends) .

Also , added packages apt-utils ca-certificates

Because build is

1.  Slow because "apt-utils" not installed

2. to avoid build to exits with error without having certificate in wget , curl or even git clone

Signed-off-by: Pratik Raj <rajpratik71@gmail.com>
---
 3.1/Dockerfile                              | 4 +++-
 4.0/Dockerfile                              | 4 +++-
 4.1/Dockerfile                              | 4 +++-
 4.2/ubuntu/16.04/Dockerfile                 | 4 +++-
 4.2/ubuntu/18.04/Dockerfile                 | 4 +++-
 5.0/ubuntu/16.04/Dockerfile                 | 6 ++++--
 5.0/ubuntu/16.04/slim/Dockerfile            | 6 ++++--
 5.0/ubuntu/18.04/Dockerfile                 | 6 ++++--
 5.0/ubuntu/18.04/slim/Dockerfile            | 6 ++++--
 5.1/ubuntu/16.04/Dockerfile                 | 6 ++++--
 5.1/ubuntu/16.04/slim/Dockerfile            | 6 ++++--
 5.1/ubuntu/18.04/Dockerfile                 | 6 ++++--
 5.1/ubuntu/18.04/slim/Dockerfile            | 6 ++++--
 5.2/ubuntu/16.04/Dockerfile                 | 6 ++++--
 5.2/ubuntu/16.04/slim/Dockerfile            | 6 ++++--
 5.2/ubuntu/18.04/Dockerfile                 | 6 ++++--
 5.2/ubuntu/18.04/slim/Dockerfile            | 6 ++++--
 5.2/ubuntu/20.04/Dockerfile                 | 6 ++++--
 5.2/ubuntu/20.04/slim/Dockerfile            | 6 ++++--
 5.3/ubuntu/16.04/Dockerfile                 | 6 ++++--
 5.3/ubuntu/16.04/slim/Dockerfile            | 6 ++++--
 5.3/ubuntu/18.04/Dockerfile                 | 6 ++++--
 5.3/ubuntu/18.04/slim/Dockerfile            | 6 ++++--
 5.3/ubuntu/20.04/Dockerfile                 | 6 ++++--
 5.3/ubuntu/20.04/slim/Dockerfile            | 6 ++++--
 nightly-5.2/ubuntu/16.04/Dockerfile         | 6 ++++--
 nightly-5.2/ubuntu/16.04/slim/Dockerfile    | 6 ++++--
 nightly-5.2/ubuntu/18.04/Dockerfile         | 6 ++++--
 nightly-5.2/ubuntu/18.04/slim/Dockerfile    | 6 ++++--
 nightly-5.3/ubuntu/16.04/Dockerfile         | 6 ++++--
 nightly-5.3/ubuntu/16.04/slim/Dockerfile    | 6 ++++--
 nightly-5.3/ubuntu/18.04/Dockerfile         | 6 ++++--
 nightly-5.3/ubuntu/18.04/slim/Dockerfile    | 6 ++++--
 nightly-5.3/ubuntu/20.04/Dockerfile         | 6 ++++--
 nightly-5.3/ubuntu/20.04/slim/Dockerfile    | 6 ++++--
 nightly-master/ubuntu/16.04/Dockerfile      | 6 ++++--
 nightly-master/ubuntu/16.04/slim/Dockerfile | 6 ++++--
 nightly-master/ubuntu/18.04/Dockerfile      | 6 ++++--
 nightly-master/ubuntu/18.04/slim/Dockerfile | 6 ++++--
 nightly-master/ubuntu/20.04/Dockerfile      | 6 ++++--
 nightly-master/ubuntu/20.04/slim/Dockerfile | 6 ++++--
 41 files changed, 159 insertions(+), 77 deletions(-)

diff --git a/3.1/Dockerfile b/3.1/Dockerfile
index d5a4aecb..685fcf76 100644
--- a/3.1/Dockerfile
+++ b/3.1/Dockerfile
@@ -4,7 +4,9 @@ LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
 RUN apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     make \
     libc6-dev \
     clang-3.8 \
diff --git a/4.0/Dockerfile b/4.0/Dockerfile
index 53d4fae5..6ea5ff9a 100644
--- a/4.0/Dockerfile
+++ b/4.0/Dockerfile
@@ -4,7 +4,9 @@ LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
 RUN apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     make \
     libc6-dev \
     clang-3.8 \
diff --git a/4.1/Dockerfile b/4.1/Dockerfile
index 37c2c71d..b4fe0624 100644
--- a/4.1/Dockerfile
+++ b/4.1/Dockerfile
@@ -4,7 +4,9 @@ LABEL Description="Docker Container for the Apple's Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
 RUN apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     make \
     libc6-dev \
     clang-3.8 \
diff --git a/4.2/ubuntu/16.04/Dockerfile b/4.2/ubuntu/16.04/Dockerfile
index c2276938..4bb11e9a 100644
--- a/4.2/ubuntu/16.04/Dockerfile
+++ b/4.2/ubuntu/16.04/Dockerfile
@@ -4,7 +4,9 @@ LABEL Description="Docker Container for the Swift programming language"
 
 # Install related packages and set LLVM 3.8 as the compiler
 RUN apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     make \
     libc6-dev \
     clang-3.8 \
diff --git a/4.2/ubuntu/18.04/Dockerfile b/4.2/ubuntu/18.04/Dockerfile
index 073fc8f0..4343e74d 100644
--- a/4.2/ubuntu/18.04/Dockerfile
+++ b/4.2/ubuntu/18.04/Dockerfile
@@ -4,7 +4,9 @@ LABEL Description="Docker Container for the Swift programming language"
 
 # Install related packages and set LLVM 3.9 as the compiler
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     make \
     libc6-dev \
     clang-3.9 \
diff --git a/5.0/ubuntu/16.04/Dockerfile b/5.0/ubuntu/16.04/Dockerfile
index c8526161..5d8ec840 100644
--- a/5.0/ubuntu/16.04/Dockerfile
+++ b/5.0/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libbsd0 \
     libcurl3 \
@@ -33,7 +35,7 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
 # Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
 RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
     && apt-get -q update \
-    && apt-get -q install -y curl \
+    && apt-get --no-install-recommends -q install -y curl \
     && curl -fSsL $SWIFT_URL -o swift.tar.gz \
     && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
     && apt-get purge -y curl \
diff --git a/5.0/ubuntu/16.04/slim/Dockerfile b/5.0/ubuntu/16.04/slim/Dockerfile
index 938766a3..1d7380d8 100644
--- a/5.0/ubuntu/16.04/slim/Dockerfile
+++ b/5.0/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libbsd0 \
     libcurl3 \
@@ -23,7 +25,7 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
 # Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
 RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
     && apt-get update \
-    && apt-get install -y curl \
+    && apt-get --no-install-recommends install -y curl \
     && curl -fSsL $SWIFT_URL -o swift.tar.gz \
     && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
     && export GNUPGHOME="$(mktemp -d)" \
diff --git a/5.0/ubuntu/18.04/Dockerfile b/5.0/ubuntu/18.04/Dockerfile
index 45fec568..3c2f400b 100644
--- a/5.0/ubuntu/18.04/Dockerfile
+++ b/5.0/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libbsd0 \
     libcurl4 \
@@ -33,7 +35,7 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
 # Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
 RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
     && apt-get update \
-    && apt-get install -y curl \
+    && apt-get --no-install-recommends install -y curl \
     && curl -fSsL $SWIFT_URL -o swift.tar.gz \
     && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
     && apt-get purge -y curl \
diff --git a/5.0/ubuntu/18.04/slim/Dockerfile b/5.0/ubuntu/18.04/slim/Dockerfile
index 141d7517..cee6a0c3 100644
--- a/5.0/ubuntu/18.04/slim/Dockerfile
+++ b/5.0/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libbsd0 \
     libcurl4 \
@@ -23,7 +25,7 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
 # Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
 RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
     && apt-get update \
-    && apt-get install -y curl gpg \
+    && apt-get --no-install-recommends install -y curl gpg \
     && curl -fSsL $SWIFT_URL -o swift.tar.gz \
     && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
     && export GNUPGHOME="$(mktemp -d)" \
diff --git a/5.1/ubuntu/16.04/Dockerfile b/5.1/ubuntu/16.04/Dockerfile
index 6d1a9227..2aec1ec8 100644
--- a/5.1/ubuntu/16.04/Dockerfile
+++ b/5.1/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.1/ubuntu/16.04/slim/Dockerfile b/5.1/ubuntu/16.04/slim/Dockerfile
index f9a2fb6a..f98aa40a 100644
--- a/5.1/ubuntu/16.04/slim/Dockerfile
+++ b/5.1/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.1/ubuntu/18.04/Dockerfile b/5.1/ubuntu/18.04/Dockerfile
index 143809b2..35d7a5a9 100644
--- a/5.1/ubuntu/18.04/Dockerfile
+++ b/5.1/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.1/ubuntu/18.04/slim/Dockerfile b/5.1/ubuntu/18.04/slim/Dockerfile
index 43ae5bc3..605b1895 100644
--- a/5.1/ubuntu/18.04/slim/Dockerfile
+++ b/5.1/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl and gpg here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/16.04/Dockerfile b/5.2/ubuntu/16.04/Dockerfile
index cf0e3851..05f3d11f 100644
--- a/5.2/ubuntu/16.04/Dockerfile
+++ b/5.2/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/16.04/slim/Dockerfile b/5.2/ubuntu/16.04/slim/Dockerfile
index d8111b0c..0fe747c0 100644
--- a/5.2/ubuntu/16.04/slim/Dockerfile
+++ b/5.2/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/18.04/Dockerfile b/5.2/ubuntu/18.04/Dockerfile
index fe93fdc8..59bcbae7 100644
--- a/5.2/ubuntu/18.04/Dockerfile
+++ b/5.2/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/18.04/slim/Dockerfile b/5.2/ubuntu/18.04/slim/Dockerfile
index 3213776d..5f414956 100644
--- a/5.2/ubuntu/18.04/slim/Dockerfile
+++ b/5.2/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl and gpg here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/20.04/Dockerfile b/5.2/ubuntu/20.04/Dockerfile
index e40f913c..e31242fe 100644
--- a/5.2/ubuntu/20.04/Dockerfile
+++ b/5.2/ubuntu/20.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     gnupg2 \
@@ -44,7 +46,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.2/ubuntu/20.04/slim/Dockerfile b/5.2/ubuntu/20.04/slim/Dockerfile
index 607fc5ae..176b12de 100644
--- a/5.2/ubuntu/20.04/slim/Dockerfile
+++ b/5.2/ubuntu/20.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl4 \
     libxml2 \
     tzdata \
@@ -32,7 +34,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl and gpg here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/16.04/Dockerfile b/5.3/ubuntu/16.04/Dockerfile
index 59f8dc29..1eeec966 100644
--- a/5.3/ubuntu/16.04/Dockerfile
+++ b/5.3/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/16.04/slim/Dockerfile b/5.3/ubuntu/16.04/slim/Dockerfile
index 2c5e13a9..2fc34259 100644
--- a/5.3/ubuntu/16.04/slim/Dockerfile
+++ b/5.3/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/18.04/Dockerfile b/5.3/ubuntu/18.04/Dockerfile
index 0d7ae15d..a36e50a4 100644
--- a/5.3/ubuntu/18.04/Dockerfile
+++ b/5.3/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -43,7 +45,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/18.04/slim/Dockerfile b/5.3/ubuntu/18.04/slim/Dockerfile
index 51705830..49f9c865 100644
--- a/5.3/ubuntu/18.04/slim/Dockerfile
+++ b/5.3/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL Description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -33,7 +35,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl and gpg here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/20.04/Dockerfile b/5.3/ubuntu/20.04/Dockerfile
index 23b40c73..933d1e31 100644
--- a/5.3/ubuntu/20.04/Dockerfile
+++ b/5.3/ubuntu/20.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     gnupg2 \
@@ -44,7 +46,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/5.3/ubuntu/20.04/slim/Dockerfile b/5.3/ubuntu/20.04/slim/Dockerfile
index 63d20f9f..d539cec3 100644
--- a/5.3/ubuntu/20.04/slim/Dockerfile
+++ b/5.3/ubuntu/20.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl4 \
     libxml2 \
     tzdata \
@@ -32,7 +34,7 @@ RUN set -e; \
     && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
     # - Grab curl and gpg here so we cache better up above
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
diff --git a/nightly-5.2/ubuntu/16.04/Dockerfile b/nightly-5.2/ubuntu/16.04/Dockerfile
index 68bc18cb..4c0621bd 100644
--- a/nightly-5.2/ubuntu/16.04/Dockerfile
+++ b/nightly-5.2/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -42,7 +44,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.2/ubuntu/16.04/slim/Dockerfile b/nightly-5.2/ubuntu/16.04/slim/Dockerfile
index 15fcb7de..73c312f1 100644
--- a/nightly-5.2/ubuntu/16.04/slim/Dockerfile
+++ b/nightly-5.2/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -32,7 +34,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.2/ubuntu/18.04/Dockerfile b/nightly-5.2/ubuntu/18.04/Dockerfile
index 3e2039a8..a1b443ce 100644
--- a/nightly-5.2/ubuntu/18.04/Dockerfile
+++ b/nightly-5.2/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -42,7 +44,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.2/ubuntu/18.04/slim/Dockerfile b/nightly-5.2/ubuntu/18.04/slim/Dockerfile
index a23f588f..2167bfe0 100644
--- a/nightly-5.2/ubuntu/18.04/slim/Dockerfile
+++ b/nightly-5.2/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -32,7 +34,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/16.04/Dockerfile b/nightly-5.3/ubuntu/16.04/Dockerfile
index dc1ef7d2..7748e717 100644
--- a/nightly-5.3/ubuntu/16.04/Dockerfile
+++ b/nightly-5.3/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -42,7 +44,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/16.04/slim/Dockerfile b/nightly-5.3/ubuntu/16.04/slim/Dockerfile
index c9f50ad9..7549e6c6 100644
--- a/nightly-5.3/ubuntu/16.04/slim/Dockerfile
+++ b/nightly-5.3/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl3 \
     libxml2 \
@@ -32,7 +34,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/18.04/Dockerfile b/nightly-5.3/ubuntu/18.04/Dockerfile
index ee02ab40..0ae264af 100644
--- a/nightly-5.3/ubuntu/18.04/Dockerfile
+++ b/nightly-5.3/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -42,7 +44,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/18.04/slim/Dockerfile b/nightly-5.3/ubuntu/18.04/slim/Dockerfile
index f35d6f5f..b68fab51 100644
--- a/nightly-5.3/ubuntu/18.04/slim/Dockerfile
+++ b/nightly-5.3/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libatomic1 \
     libcurl4 \
     libxml2 \
@@ -32,7 +34,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/20.04/Dockerfile b/nightly-5.3/ubuntu/20.04/Dockerfile
index d032757b..9758ad44 100644
--- a/nightly-5.3/ubuntu/20.04/Dockerfile
+++ b/nightly-5.3/ubuntu/20.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     gnupg2 \
@@ -43,7 +45,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-5.3/ubuntu/20.04/slim/Dockerfile b/nightly-5.3/ubuntu/20.04/slim/Dockerfile
index 77c391ab..71f57b9b 100644
--- a/nightly-5.3/ubuntu/20.04/slim/Dockerfile
+++ b/nightly-5.3/ubuntu/20.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl4 \
     libxml2 \
     tzdata \
@@ -31,7 +33,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/16.04/Dockerfile b/nightly-master/ubuntu/16.04/Dockerfile
index e1ee7b9a..49b172dd 100644
--- a/nightly-master/ubuntu/16.04/Dockerfile
+++ b/nightly-master/ubuntu/16.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     libc6-dev \
@@ -41,7 +43,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/16.04/slim/Dockerfile b/nightly-master/ubuntu/16.04/slim/Dockerfile
index efec6dae..0f897445 100644
--- a/nightly-master/ubuntu/16.04/slim/Dockerfile
+++ b/nightly-master/ubuntu/16.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl3 \
     libxml2 \
     tzdata \
@@ -31,7 +33,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/18.04/Dockerfile b/nightly-master/ubuntu/18.04/Dockerfile
index 66b0bdfc..9b71249d 100644
--- a/nightly-master/ubuntu/18.04/Dockerfile
+++ b/nightly-master/ubuntu/18.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     libc6-dev \
@@ -41,7 +43,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/18.04/slim/Dockerfile b/nightly-master/ubuntu/18.04/slim/Dockerfile
index 773455cd..62aa4591 100644
--- a/nightly-master/ubuntu/18.04/slim/Dockerfile
+++ b/nightly-master/ubuntu/18.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl4 \
     libxml2 \
     tzdata \
@@ -31,7 +33,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/20.04/Dockerfile b/nightly-master/ubuntu/20.04/Dockerfile
index 035a9a5d..23ab40c0 100644
--- a/nightly-master/ubuntu/20.04/Dockerfile
+++ b/nightly-master/ubuntu/20.04/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     binutils \
     git \
     gnupg2 \
@@ -45,7 +47,7 @@ RUN echo "${SWIFT_WEBROOT}/latest-build.yml"
 RUN set -e; \
     # - Grab curl here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \
diff --git a/nightly-master/ubuntu/20.04/slim/Dockerfile b/nightly-master/ubuntu/20.04/slim/Dockerfile
index 74bce384..72b87f39 100644
--- a/nightly-master/ubuntu/20.04/slim/Dockerfile
+++ b/nightly-master/ubuntu/20.04/slim/Dockerfile
@@ -3,7 +3,9 @@ LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
 LABEL description="Docker Container for the Swift programming language"
 
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
-    apt-get -q install -y \
+    apt-get --no-install-recommends install -y \
+    apt-utils \
+    ca-certificates \
     libcurl4 \
     libxml2 \
     tzdata \
@@ -31,7 +33,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 RUN set -e; \
     # - Grab curl and gpg here so we cache better up above
     export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -q update && apt-get -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
+    && apt-get -q update && apt-get --no-install-recommends -q install -y curl gnupg && rm -rf /var/lib/apt/lists/* \
     # - Latest Toolchain info
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g')  \
     && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g')  \