Commit 07ca6060 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'install-dependencies-from-package' into 'master'

Install dependencies from package

Some more improvements to the Vagrantfile and documentation.

* Install RVM from their PPA
* Install Recent Go from Ubuntu-LXC PPA

See merge request !90
parents 35a669d9 d514e345
......@@ -99,12 +99,10 @@ bundle config build.nokogiri --with-iconv-dir=/usr/local/opt/libiconv
Please read [the prerequisites for all platforms](#prerequisites-for-all-platforms).
```
sudo apt-get install git postgresql libpq-dev phantomjs redis-server libicu-dev cmake g++ nodejs libkrb5-dev nginx ed pkg-config
sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-stable && sudo apt-get update
sudo apt-get install git postgresql libpq-dev phantomjs redis-server libicu-dev cmake g++ nodejs libkrb5-dev golang nginx ed pkg-config
```
You also need to install [Go](https://golang.org/dl) because the
Go version included in most Ubuntu versions is too old for GitLab.
##### Arch Linux
Please read [the prerequisites for all platforms](#prerequisites-for-all-platforms).
......
......@@ -47,6 +47,8 @@ required_plugins.each do |plugin|
end
$apt_reqs = <<EOT
apt-add-repository -y ppa:rael-gc/rvm
apt-add-repository -y ppa:ubuntu-lxc/lxd-stable
apt-get update
apt-get -y install git postgresql libpq-dev phantomjs redis-server libicu-dev cmake g++ nodejs libkrb5-dev curl ruby ed golang nginx
EOT
......@@ -60,9 +62,11 @@ if [ $(id -u vagrant) != $(stat -c %u /vagrant) ]; then
else
DEV_USER=vagrant
fi
sudo -u $DEV_USER -i bash -c "gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3"
sudo -u $DEV_USER -i bash -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1.6"
sudo -u $DEV_USER -i bash -c "gem install bundler"
sudo apt-get install -y rvm \
&& sudo addgroup $DEV_USER rvm \
&& sudo -u $DEV_USER -i bash -l -c "rvm install 2.1.6 \
&& rvm use 2.1.6 --default \
&& gem install bundler"
sudo chown -R $DEV_USER:$DEV_USER /home/vagrant
sudo ln -s /vagrant /home/vagrant/gitlab-development-kit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment