diff options
| author | Giovane <giovaneliberato@gmail.com> | 2015-12-15 14:17:30 -0200 |
|---|---|---|
| committer | Giovane <giovaneliberato@gmail.com> | 2015-12-15 14:18:35 -0200 |
| commit | fbf524814bdd4dadaf69f714eb5c60d482274645 (patch) | |
| tree | 9663d6351c177c0880ba4ee90267cbf37f9776fb | |
| parent | 693e7f90fb5c0eaec9d04def13bb79c6dd8b0f17 (diff) | |
Updates vagrant box image and fix jshint path.
- Change vagrant image to debian jessie
- Uses absolute path to jshint on package.json
| -rw-r--r-- | Vagrantfile | 14 | ||||
| -rw-r--r-- | web-ui/package.json | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile index 00ce6899..9f961dc9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,7 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "LEAP/wheezy" + config.vm.box = "debian/jessie64" config.vm.define "source", primary: true do |source| source.vm.provision "puppet" do |puppet| @@ -14,6 +14,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end end + config.vm.provision "shell", :inline => <<-SHELL + apt-get update + apt-get install -y puppet + SHELL + + for plugin in ['vagrant-vbguest'] + unless Vagrant.has_plugin?(plugin) + puts "Missing plugin #{plugin}, installing..." + `vagrant plugin install #{plugin}` + end + end + config.vm.define "deb", autostart: false do |deb| deb.vm.provision "puppet" do |puppet| puppet.manifests_path = "provisioning/manifests" diff --git a/web-ui/package.json b/web-ui/package.json index ced54b77..b768a157 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -32,7 +32,7 @@ "compass": "compass compile", "compass-watch": "compass watch", "build": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass", - "jshint": "jshint --config=.jshintrc app test", + "jshint": "node_modules/jshint/bin/jshint --config=.jshintrc app test", "clean": "rm -rf .tmp/ dist/**/* app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", |