corrigindo Vagrantfile e requisitos dos pacotes

Carlos Vieira
1 parent 39bd302f
Showing 5 changed files with 36 additions and 26 deletions Show diff stats
Vagrantfile
package.json
provision.sh
provision_root.sh
recipes/outubrorosa/compile.sh
@@ -5,7 +5,8 @@ VAGRANTFILE_API_VERSION = &#39;2&#39;
  
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'ubuntu/trusty64'
-  config.vm.provision :shell, path: 'provision.sh'
+  config.vm.provision :shell, path: 'provision_root.sh'
+  config.vm.provision :shell, path: 'provision.sh', privileged: false
   config.vm.network :forwarded_port, guest: 5000, host: 5000
 	if Vagrant.has_plugin?("vagrant-cachier")
   		config.cache.scope = :box
@@ -2,12 +2,12 @@
 "name": "BarraBrasil",
 "description": "Barra oficial do governo federal brasileiro",
 "devDependencies": {
-"coffee-script": "1.9.3",
+"coffee-script": "1.10.0",
 "uglifyjs": "2.4.10",
 "express": "4.13.3",
 "chai": "3.2.0",
 "chai-jq": "0.0.8",
-"mocha": "2.2.5",
+"mocha": "2.3.3",
 "zombie": "4.1.0",
 "ejs": "2.3.3"
 },
@@ -2,28 +2,22 @@
 set -e -x -o pipefail
 export DEBIAN_FRONTEND='noninteractive'
  
-sudo add-apt-repository ppa:chris-lea/node.js
-sudo apt-get update
+cd /home/vagrant
  
-apt-get install -y \
-  python-dev \
-  python-pip \
-  nodejs \
-  ruby
+# Installing nvm
+wget -qO- https://raw.github.com/creationix/nvm/master/install.sh | sh
  
-pip install \
-  Flask \
-  config \
-  assetgen
+# This enables NVM without a logout/login
+export NVM_DIR="/home/vagrant/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
  
-npm install -g \
-  coffee-script \
-  uglify-js \
-  express \
-  ejs \
-  zombie \
-  mocha \
-  chai \
-  chai-jq
+# Install a node and alias
+nvm install iojs
+nvm alias default iojs
  
-gem install sass
+rm -Rf barra-govbr/
+GIT_SSL_NO_VERIFY=true git clone http://portal.softwarepublico.gov.br/gitlab/govbr/barra-govbr.git
+
+cd barra-govbr
+
+make venv
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e -x -o pipefail
+export DEBIAN_FRONTEND='noninteractive'
+
+sudo apt-get update
+
+apt-get install -y \
+  git \
+  python-dev \
+  python-pip \
+  python-virtualenv \
+  ruby
+
+gem install sass
+
@@ -2,7 +2,7 @@
 export PATH=$PATH:../../node_modules/.bin/
 ../../venv/bin/assetgen ./barra-brasil-1.yaml
 ../../venv/bin/assetgen ./barra-brasil-2.yaml
-#../../venv/bin/assetgen ./footer-brasil-1.yaml
-#../../venv/bin/assetgen ./footer-brasil-2.yaml
+../../venv/bin/assetgen ./footer-brasil-1.yaml
+../../venv/bin/assetgen ./footer-brasil-2.yaml
 ../../venv/bin/assetgen ./barra-brasil-final.yaml
...	...	@@ -5,7 +5,8 @@ VAGRANTFILE_API_VERSION = '2'
5	5
6	6	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
7	7	config.vm.box = 'ubuntu/trusty64'
8		- config.vm.provision :shell, path: 'provision.sh'
	8	+ config.vm.provision :shell, path: 'provision_root.sh'
	9	+ config.vm.provision :shell, path: 'provision.sh', privileged: false
9	10	config.vm.network :forwarded_port, guest: 5000, host: 5000
10	11	if Vagrant.has_plugin?("vagrant-cachier")
11	12	config.cache.scope = :box
...	...
...	...	@@ -2,12 +2,12 @@
2	2	"name": "BarraBrasil",
3	3	"description": "Barra oficial do governo federal brasileiro",
4	4	"devDependencies": {
5		-"coffee-script": "1.9.3",
	5	+"coffee-script": "1.10.0",
6	6	"uglifyjs": "2.4.10",
7	7	"express": "4.13.3",
8	8	"chai": "3.2.0",
9	9	"chai-jq": "0.0.8",
10		-"mocha": "2.2.5",
	10	+"mocha": "2.3.3",
11	11	"zombie": "4.1.0",
12	12	"ejs": "2.3.3"
13	13	},
...	...
...	...	@@ -2,28 +2,22 @@
2	2	set -e -x -o pipefail
3	3	export DEBIAN_FRONTEND='noninteractive'
4	4
5		-sudo add-apt-repository ppa:chris-lea/node.js
6		-sudo apt-get update
	5	+cd /home/vagrant
7	6
8		-apt-get install -y \
9		- python-dev \
10		- python-pip \
11		- nodejs \
12		- ruby
	7	+# Installing nvm
	8	+wget -qO- https://raw.github.com/creationix/nvm/master/install.sh \| sh
13	9
14		-pip install \
15		- Flask \
16		- config \
17		- assetgen
	10	+# This enables NVM without a logout/login
	11	+export NVM_DIR="/home/vagrant/.nvm"
	12	+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
18	13
19		-npm install -g \
20		- coffee-script \
21		- uglify-js \
22		- express \
23		- ejs \
24		- zombie \
25		- mocha \
26		- chai \
27		- chai-jq
	14	+# Install a node and alias
	15	+nvm install iojs
	16	+nvm alias default iojs
28	17
29		-gem install sass
	18	+rm -Rf barra-govbr/
	19	+GIT_SSL_NO_VERIFY=true git clone http://portal.softwarepublico.gov.br/gitlab/govbr/barra-govbr.git
	20	+
	21	+cd barra-govbr
	22	+
	23	+make venv
...	...
...	...	@@ -0,0 +1,15 @@
	1	+#!/bin/bash
	2	+set -e -x -o pipefail
	3	+export DEBIAN_FRONTEND='noninteractive'
	4	+
	5	+sudo apt-get update
	6	+
	7	+apt-get install -y \
	8	+ git \
	9	+ python-dev \
	10	+ python-pip \
	11	+ python-virtualenv \
	12	+ ruby
	13	+
	14	+gem install sass
	15	+
...	...
...	...	@@ -2,7 +2,7 @@
2	2	export PATH=$PATH:../../node_modules/.bin/
3	3	../../venv/bin/assetgen ./barra-brasil-1.yaml
4	4	../../venv/bin/assetgen ./barra-brasil-2.yaml
5		-#../../venv/bin/assetgen ./footer-brasil-1.yaml
6		-#../../venv/bin/assetgen ./footer-brasil-2.yaml
	5	+../../venv/bin/assetgen ./footer-brasil-1.yaml
	6	+../../venv/bin/assetgen ./footer-brasil-2.yaml
7	7	../../venv/bin/assetgen ./barra-brasil-final.yaml
8	8
...	...