Consolidate some package installations

Vagrantfile

@@ -1,4 +1,6 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/buster64"
+  config.vm.box = "debian/contrib-buster64"
+  config.vm.synced_folder ".", "/vagrant"
+  config.vm.network "private_network", type: "dhcp"
   config.vm.provision "shell", path: "install-docker.sh"
 end

install-docker.sh

@@ -4,6 +4,14 @@
 #docker_version="5:18.09.9~3-0~debian-buster"
 #compose_version="1.25.0"
 
+
+
+# Install software used for downloading Docker
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+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
   packages="docker-ce docker-ce-cli containerd.io"
@@ -17,12 +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 update
-apt-get install -y apt-transport-https ca-certificates \
-                   curl 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