Merge pull request #214 from mozilla/develop-latest-test

Fix awsbox deployment
This commit is contained in:
Nick Chapman 2014-01-12 22:18:46 -08:00
Родитель 66addacdee 206c778865
Коммит 2f22719983
3 изменённых файлов: 16 добавлений и 13 удалений

Просмотреть файл

@ -28,7 +28,7 @@ module.exports = function (grunt) {
// show elapsed time at the end
require('time-grunt')(grunt);
// load all grunt tasks
require('load-grunt-tasks')(grunt);
require('load-grunt-tasks')(grunt, {scope: 'dependencies'});
grunt.initConfig({
});

Просмотреть файл

@ -18,6 +18,8 @@
"author": "Mozilla (https://mozilla.org/)",
"license": "MPL 2.0",
"dependencies": {
"bower": "1.2.8",
"jshint": "0.9.1",
"connect-cachify": "0.0.15",
"convict": "0.4.0",
"express": "3.3.4",
@ -25,14 +27,6 @@
"jwcrypto": "0.4.3",
"intel": "0.4.0",
"helmet": "0.1.2",
"connect-fonts": "0.0.12",
"connect-fonts-firasans": "0.0.2",
"connect-fonts-clearsans": "0.0.1"
},
"devDependencies": {
"bower": "1.2.8",
"awsbox": "0.6.2",
"jshint": "0.9.1",
"grunt": "~0.4.1",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-concat": "~0.3.0",
@ -54,11 +48,18 @@
"grunt-requirejs": "~0.4.0",
"grunt-svgmin": "~0.2.0",
"grunt-concurrent": "~0.3.0",
"load-grunt-tasks": "~0.1.0",
"time-grunt": "~0.1.1",
"intern-geezer": "1.3.2",
"jshint-stylish": "~0.1.4",
"grunt-preprocess": "~3.0.1",
"load-grunt-tasks": "0.2.1",
"time-grunt": "~0.1.1",
"jshint-stylish": "~0.1.4",
"connect-fonts": "0.0.12",
"connect-fonts-firasans": "0.0.2",
"connect-fonts-clearsans": "0.0.1",
"grunt-cli": "0.1.11"
},
"devDependencies": {
"awsbox": "0.6.2",
"intern-geezer": "1.3.2",
"xmlhttprequest": "git://github.com/zaach/node-XMLHttpRequest.git#onerror"
},
"engines": {

Просмотреть файл

@ -10,4 +10,6 @@ else
nohup /usr/bin/circusd --daemon /home/app/circus.ini > /home/app/circusd.log 2>&1 &
fi
node_modules/.bin/grunt build
echo "DONE"