From 8a36ddd69dcc9f88fe4e2afd83130a11247a5959 Mon Sep 17 00:00:00 2001 From: nywilken Date: Fri, 15 Nov 2019 12:25:13 -0500 Subject: [PATCH] scripts/vagrant: Update Vagrant bootstrapping scripts --- scripts/vagrant-linux-priv-go.sh | 7 +++---- scripts/vagrant-linux-unpriv-bootstrap.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index ef5503b6e..f9e792cb0 100755 --- a/scripts/vagrant-linux-priv-go.sh +++ b/scripts/vagrant-linux-priv-go.sh @@ -1,10 +1,9 @@ #!/usr/bin/env bash function install_go() { - local go_version=1.11.1 + local go_version=1.13 local download= - - download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz" + download="https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz" if [ -d /usr/local/go ] ; then return @@ -18,7 +17,7 @@ function install_go() { } install_go - + # Ensure that the GOPATH tree is owned by vagrant:vagrant mkdir -p /opt/gopath chown -R vagrant:vagrant /opt/gopath diff --git a/scripts/vagrant-linux-unpriv-bootstrap.sh b/scripts/vagrant-linux-unpriv-bootstrap.sh index ff8783e97..04cc38bec 100755 --- a/scripts/vagrant-linux-unpriv-bootstrap.sh +++ b/scripts/vagrant-linux-unpriv-bootstrap.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -cd /opt/gopath/src/github.com/hashicorp/packer && make deps +cd /opt/gopath/src/github.com/hashicorp/packer && make dev