Skip to content

Commit

Permalink
Staging (#268)
Browse files Browse the repository at this point in the history
* Import Data

* Import Data

* Import Data

* Import API Update

* Import API Fix

* Update

* Updates Import API

* Updates Import API

* Updates Import API

* Import API Update

* Update

* Import API Update

* Import API Update

* chaging rolling update to api

* Import API Fix

* Import API Fix

* Import API Test

* Import API Test

* Import API Fix

* Update README.md

* Import Export API (#262)

* Import Export API (#263)

* Import Export API

* Import Export API

* Import API
  • Loading branch information
shubhamqweasd authored Oct 31, 2017
1 parent dbb8631 commit 472dba6
Show file tree
Hide file tree
Showing 10 changed files with 1,224 additions and 416 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ after_success:
openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
mkdir ~/.kube;
mv config ~/.kube/;
kubectl rolling-update cloudboost-engine-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
kubectl rolling-update cloudboost-api-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
fi
before_deploy:
- git config --global user.email "[email protected]"
Expand All @@ -71,7 +71,7 @@ after_deploy:
openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
mkdir ~/.kube;
mv config ~/.kube/;
kubectl rolling-update cloudboost-engine --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
kubectl rolling-update cloudboost-api --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
fi
branches:
except:
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](https://travis-ci.org/CloudBoost/cloudboost.svg?branch=master)](https://travis-ci.org/CloudBoost/cloudboost)
[![OpenCollective](https://opencollective.com/cloudboost/backers/badge.svg)](#backers)

CloudBoost is the complete serverless platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
CloudBoost is the complete cloud platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
- Data-Storage / JSON Storage / BLOB Storage
- 100% data ownership
- Realtime
Expand All @@ -12,6 +12,7 @@ CloudBoost is the complete serverless platform for your app. **Think of CloudBoo
- Queues
- More - ACL's, User Authentication, Server-less apps and more.

CloudBoost also has a [managed service](https://www.cloudboost.io), so you don't have to install or configure anything. You can sign up for the managed service [here.](https://www.cloudboost.io)


## Deploy with Docker (recommended)
Expand Down Expand Up @@ -156,6 +157,10 @@ To read more about app settings, check [Click here](https://github.com/CloudBoos
- Email: [[email protected]]([email protected])
- Twitter: [@cloudboostio](https://twitter.com/cloudboostio)

# Tests

Tests are in a seperate repository. You can find them [here.](https://www.github.com/cloudboost/javascriptsdk)

# Contributing

[Pull requests](https://help.github.com/articles/about-pull-requests/) are very welcome!
Expand Down
260 changes: 150 additions & 110 deletions api/app/App.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions api/file/CloudFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module.exports = function() {
}).then(function(file) {
return res.status(200).send(file);
}, function(err) {
console.log(err, "++++++++++++++++++++++")
return res.status(500).send(err);
});
});
Expand Down
Binary file added myBinaryFile
Binary file not shown.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"cors": "^2.7.1",
"cron": "^1.1.0",
"crypto": "^0.0.3",
"csvtojson": "^1.1.7",
"ejs": "^2.4.1",
"elasticsearch": "^8.0.0",
"express": "^4.13.4",
Expand All @@ -44,11 +45,11 @@
"mandrill-api": "^1.0.45",
"mongodb": "^2.1.11",
"mongoose": "^4.4.10",
"multer": "^0.1.8",
"node-gcm": "^0.14.0",
"node-linkedin": "^0.5.3",
"node-twitter-api": "^1.7.1",
"node-uuid": "^1.4.7",
"node-xlsx": "^0.11.0",
"nodemailer": "^2.4.1",
"nodemailer-mailgun-transport": "^1.0.2",
"oauth": "^0.9.14",
Expand Down
2 changes: 2 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ global.fileService = null;
global.queueService = null;
global.serverService = null;
global.mailService = null;
global.helperService = null;

global.mongoUtil = null;

Expand Down Expand Up @@ -324,6 +325,7 @@ function attachServices() {
global.pushService = require('./services/cloudPush.js')();
global.emailService = require('./services/cloudEmail.js')();
global.authService = require('./services/auth.js')();
global.importHelpers = require('./services/importHelpers.js')();

console.log('+++++++++++ Services Status : OK. ++++++++++++++++++');
} catch (e) {
Expand Down
Loading

0 comments on commit 472dba6

Please sign in to comment.