From 0b3fb72a97dac12d31b7d08e517a9bcd1bbfee61 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Tue, 20 Feb 2018 21:16:50 +0100 Subject: [PATCH] update Vagrant to use bento/ubuntu and lowercase github namespace --- .dev/vagrant/provision.sh | 16 ++++++++-------- Vagrantfile | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.dev/vagrant/provision.sh b/.dev/vagrant/provision.sh index c92e9be..4048639 100644 --- a/.dev/vagrant/provision.sh +++ b/.dev/vagrant/provision.sh @@ -1,9 +1,9 @@ #!/bin/bash echo "Provisioning development environment for Pterodactyl go daemon." -cp /home/ubuntu/go/github.com/Pterodactyl/wings.go/.dev/vagrant/motd.txt /etc/motd +cp /home/vagrant/go/github.com/pterodactyl/wings.go/.dev/vagrant/motd.txt /etc/motd -chown -R ubuntu:ubuntu /home/ubuntu/go +chown -R ubuntu:ubuntu /home/vagrant/go chown -R ubuntu:ubuntu /srv echo "Update apt repositories" @@ -17,20 +17,20 @@ usermod -aG docker ubuntu echo "Install go" apt-get install -y golang-go -echo "export GOPATH=/home/ubuntu/go" >> /home/ubuntu/.profile +echo "export GOPATH=/home/vagrant/go" >> /home/vagrant/.profile export GOPATH=/go -echo 'export PATH=$PATH:$GOPATH/bin' >> /home/ubuntu/.profile +echo 'export PATH=$PATH:$GOPATH/bin' >> /home/vagrant/.profile echo "Install go dep" -sudo -H -u ubuntu bash -c 'go get -u github.com/golang/dep/cmd/dep' +sudo -H -u vagrant bash -c 'go get -u github.com/golang/dep/cmd/dep' echo "Install delve for debugging" -sudo -H -u ubuntu bash -c 'go get -u github.com/derekparker/delve/cmd/dlv' +sudo -H -u vagrant bash -c 'go get -u github.com/derekparker/delve/cmd/dlv' echo "Install additional dependencies" apt-get -y install mercurial #tar unzip make gcc g++ python > /dev/null echo " ------------" -echo "Gopath is /home/ubuntu/go" -echo "The project is mounted to /home/ubuntu/go/src/github.com/Pterodactyl/wings.go" +echo "Gopath is /home/vagrant/go" +echo "The project is mounted to /home/vagrant/go/src/github.com/pterodactyl/wings" echo "Provisioning is completed." diff --git a/Vagrantfile b/Vagrantfile index 8656ee4..22bcea7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ Vagrant.configure("2") do |cfg| - cfg.vm.box = "ubuntu/xenial64" + cfg.vm.box = "bento/ubuntu-16.04" - cfg.vm.synced_folder "./", "/home/ubuntu/go/src/github.com/Pterodactyl/wings" + cfg.vm.synced_folder "./", "/home/vagrant/go/src/github.com/pterodactyl/wings" cfg.vm.provision :shell, path: ".dev/vagrant/provision.sh"