From f4877823a0f093403ce4834991a2875c28a3b8d6 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <KrisPublicEmail@gmail.com>
Date: Wed, 7 Oct 2020 20:57:49 -0400
Subject: [PATCH] Consolidate some package installations

---
 install-docker.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/install-docker.sh b/install-docker.sh
index 66c515f..1ca9971 100644
--- a/install-docker.sh
+++ b/install-docker.sh
@@ -6,9 +6,11 @@
 
 
 
-# Install curl for downloading docker-compose
+# Install software used for downloading Docker
+export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install -y curl
+apt-get install -y curl apt-transport-https ca-certificates \
+                   gnupg-agent software-properties-common
 
 # Set default versions if override settings don't exist
 if [ -z ${docker_version+x} ]; then
@@ -23,11 +25,6 @@ if [ -z ${compose_version+x} ]; then
   compose_version=$(echo $latest | awk '{print substr($1, 14, length($1) - 14)}')
 fi
 
-# Allow apt to use a repository over HTTPS
-export DEBIAN_FRONTEND=noninteractive
-apt-get install -y apt-transport-https ca-certificates \
-                   gnupg-agent software-properties-common
-
 # Add Docker’s official GPG key
 curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
 sudo apt-key fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88