Consolidate some package installations

This commit is contained in:
Kris Lamoureux 2020-10-07 20:57:49 -04:00
parent bb7ca7f1e5
commit f4877823a0
Signed by: kris
GPG Key ID: 3EDA9C3441EDA925

View File

@ -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 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 # Set default versions if override settings don't exist
if [ -z ${docker_version+x} ]; then 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)}') compose_version=$(echo $latest | awk '{print substr($1, 14, length($1) - 14)}')
fi 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 Dockers official GPG key # Add Dockers official GPG key
curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
sudo apt-key fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 sudo apt-key fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88