diff --git a/README.md b/README.md index 198113bb..5205a556 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ $ cd /vagrant && cargo run -- scrape To install dependencies for the front-end development server and run it: ``` -$ cd /vagrant/front && npm install && bower install +$ cd /vagrant/front $ ember server --proxy=http://localhost:8080 ``` diff --git a/Vagrantfile b/Vagrantfile index 72a10780..cb97e4eb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,6 +9,11 @@ Vagrant.configure("2") do |config| path: "vagrant/native_deps.sh", keep_color: true) + config.vm.provision("frontend", + type: "shell", + path: "vagrant/frontend.sh", + keep_color: true) + config.vm.provision("postgres", type: "shell", path: "vagrant/postgres.sh", diff --git a/vagrant/frontend.sh b/vagrant/frontend.sh new file mode 100644 index 00000000..e1ccc521 --- /dev/null +++ b/vagrant/frontend.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +set -e + +# global deps +npm install -g ember-cli +npm install -g bower + +# keep node modules in VM file system to speedup npm install and fix it on Windows/Linux machines +mkdir -p /home/vagrant/local_front/node_modules +rm -f /vagrant/front/node_modules || true +ln -s /home/vagrant/local_front/node_modules /vagrant/front/ +chown -R vagrant:vagrant /home/vagrant/local_front +chown -R vagrant:vagrant /vagrant/front/node_modules + +# install local deps +su vagrant <<'EOF' +cd /vagrant/front +npm install +bower install +EOF diff --git a/vagrant/native_deps.sh b/vagrant/native_deps.sh index 403763f2..997316cd 100755 --- a/vagrant/native_deps.sh +++ b/vagrant/native_deps.sh @@ -16,7 +16,3 @@ locale-gen en_US.UTF-8 apt-get update apt-get install -y postgresql libpq-dev npm nodejs curl git ln -s /usr/bin/nodejs /usr/bin/node - -# frontend deps -npm install -g ember-cli -npm install -g bower diff --git a/vagrant/vagrant_env.sh b/vagrant/vagrant_env.sh index 393ba952..7a404c0a 100755 --- a/vagrant/vagrant_env.sh +++ b/vagrant/vagrant_env.sh @@ -8,6 +8,7 @@ export GITHUB_SCRAPE_INTERVAL=2 export RELEASES_SCRAPE_INTERVAL=720 export BUILDBOT_SCRAPE_INTERVAL=80 export SERVER_PORT=8080 +export POST_COMMENTS=false # VM config for cargo export CARGO_TARGET_DIR=/rust-dashboard/target