diff --git a/Vagrantfile b/Vagrantfile index 3544b1f..0da17c3 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,7 @@ Vagrant.require_version ">= 2.1.1" VAGRANTFILE_API_VERSION = '2' Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = 'ubuntu/xenial64' + config.vm.box = 'ubuntu/bionic64' config.vm.provision :shell, path: 'provision_root.sh' config.vm.provision :shell, path: 'provision.sh', privileged: false config.vm.network :forwarded_port, guest: 5000, host: 5000 diff --git a/provision_root.sh b/provision_root.sh index a80d61c..a505927 100644 --- a/provision_root.sh +++ b/provision_root.sh @@ -9,28 +9,28 @@ apt-get install -y \ ca-certificates \ curl \ git \ - linux-image-extra-$(uname -r) \ - linux-image-extra-virtual \ + gnupg-agent \ python-dev \ python-pip \ python-virtualenv \ ruby \ - ruby-dev + ruby-dev \ + software-properties-common -curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add - +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - add-apt-repository \ - "deb https://apt.dockerproject.org/repo/ \ - ubuntu-$(lsb_release -cs) \ - main" + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" apt-get update -apt-get -y install docker-engine +apt-get install -y docker-ce docker-ce-cli containerd.io usermod -aG docker ubuntu -curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +curl -L "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose -- libgit2 0.21.2