From bd61ea137a6c09204cbd264a7af85e8bbaa419ba Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Fri, 16 Oct 2020 13:37:12 +0700 Subject: [PATCH] Install Docker manually --- Vagrantfile | 18 ++++++++++-------- umbrel-dev | 2 -- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index d3bd9d4..ca96ace 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -23,10 +23,7 @@ TEXT Vagrant.configure(2) do |config| # Install required plugins - config.vagrant.plugins = { - "vagrant-vbguest" => {"version" => "0.24.0"}, - "vagrant-docker-compose" => {"version" => "1.5.1"}, - } + config.vagrant.plugins = {"vagrant-vbguest" => {"version" => "0.24.0"}} # Setup VM config.vm.define "umbrel-dev" @@ -41,15 +38,20 @@ Vagrant.configure(2) do |config| vb.customize ["modifyvm", :id, "--memory", "4096"] end - # Provision Docker - config.vm.provision :docker - config.vm.provision :docker_compose - # Update package lists config.vm.provision "shell", inline: <<-SHELL apt-get update SHELL + # Install Docker + config.vm.provision "shell", inline: <<-SHELL + sudo apt-get install -y curl + curl -fsSL https://get.docker.com | sudo sh + sudo usermod -aG docker vagrant + sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose + SHELL + # Install Avahi config.vm.provision "shell", inline: <<-SHELL apt-get install -y avahi-daemon avahi-discover libnss-mdns diff --git a/umbrel-dev b/umbrel-dev index 0a25d21..f518163 100755 --- a/umbrel-dev +++ b/umbrel-dev @@ -109,8 +109,6 @@ if [[ "$command" = "init" ]]; then echo vagrant plugin install --local vagrant-vbguest --plugin-version=0.24.0 - echo - vagrant plugin install --local vagrant-docker-compose --plugin-version=1.5.1 echo echo "Cloning container repositories..."