Compare commits

..

No commits in common. "f4877823a0f093403ce4834991a2875c28a3b8d6" and "f8238c4690a44141c47179a43f4ee29642879178" have entirely different histories.

2 changed files with 7 additions and 11 deletions

4
Vagrantfile vendored
View File

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

View File

@ -4,14 +4,6 @@
#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"
@ -25,6 +17,12 @@ 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 Dockers official GPG key
curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
sudo apt-key fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88