Updates go version to 1.5.1, and modernizes the Vagrantfile.
Drops 32bit in the Vagrantfile as well since we can build that with gox and don't need a special environment for it. The Vagrantfile is now just a good default development environment.
This commit is contained in:
parent
d5e200874b
commit
009a2b3b50
|
@ -43,7 +43,7 @@ http://www.consul.io/docs
|
|||
## Developing Consul
|
||||
|
||||
If you wish to work on Consul itself, you'll first need [Go](https://golang.org)
|
||||
installed (version 1.4+ is _required_). Make sure you have Go properly installed,
|
||||
installed (version 1.5.1+ is _required_). Make sure you have Go properly installed,
|
||||
including setting up your [GOPATH](https://golang.org/doc/code.html#GOPATH).
|
||||
|
||||
Next, clone this repository into `$GOPATH/src/github.com/hashicorp/consul` and
|
||||
|
@ -66,7 +66,7 @@ format the code according to Go standards.
|
|||
|
||||
### Building Consul on Windows
|
||||
|
||||
Make sure Go 1.4+ is installed on your system and that the Go command is in your
|
||||
Make sure Go 1.5.1+ is installed on your system and that the Go command is in your
|
||||
%PATH%.
|
||||
|
||||
For building Consul on Windows, you also need to have MinGW installed.
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
VAGRANTFILE_API_VERSION = '2'
|
||||
|
||||
@script = <<SCRIPT
|
||||
GOVERSION="1.5.1"
|
||||
SRCROOT="/opt/go"
|
||||
SRCPATH="/opt/gopath"
|
||||
|
||||
|
@ -17,8 +18,8 @@ sudo apt-get install -y build-essential git-core
|
|||
|
||||
# Install Go
|
||||
cd /tmp
|
||||
wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go1.4.2.linux-${ARCH}.tar.gz
|
||||
tar -xvf go1.4.2.linux-${ARCH}.tar.gz
|
||||
wget --quiet --no-check-certificate https://storage.googleapis.com/golang/go${GOVERSION}.linux-${ARCH}.tar.gz
|
||||
tar -xvf go${GOVERSION}.linux-${ARCH}.tar.gz
|
||||
sudo mv go $SRCROOT
|
||||
sudo chmod 775 $SRCROOT
|
||||
sudo chown vagrant:vagrant $SRCROOT
|
||||
|
@ -56,14 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
end
|
||||
end
|
||||
|
||||
# Note we use older boxes here to avoid glibc version check problems with
|
||||
# the built C dependencies.
|
||||
config.vm.define '64bit' do |n1|
|
||||
n1.vm.box = 'chef/ubuntu-10.04'
|
||||
end
|
||||
|
||||
config.vm.define '32bit' do |n2|
|
||||
n2.vm.box = 'chef/ubuntu-10.04-i386'
|
||||
n1.vm.box = 'hashicorp/precise64'
|
||||
end
|
||||
|
||||
config.push.define "www", strategy: "local-exec" do |push|
|
||||
|
|
Loading…
Reference in New Issue