Spearhead
/
joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: TypeError exception

This commit is contained in:
Wyatt Preul 2017-09-13 09:54:19 -05:00 committed by Sérgio Ramos
parent 9eda12e75d
commit 2ce08bbe30
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose.yml
View File

@ -28,7 +28,7 @@ consul:
# it is included here for demo purposes and is not required # it is included here for demo purposes and is not required
############################################################################# #############################################################################
prometheus: prometheus:
image: autopilotpattern/prometheus:1.7.1-r24 image: autopilotpattern/prometheus:1.7.1-r20
restart: always restart: always
mem_limit: 1g mem_limit: 1g
ports: ports:
@ -46,7 +46,7 @@ prometheus:
# FRONTEND # FRONTEND
############################################################################# #############################################################################
frontend: frontend:
image: joyent/copilot-frontend:1.3.4 image: joyent/copilot-frontend:1.0.0
mem_limit: 512m mem_limit: 512m
links: links:
- consul:consul - consul:consul
@ -66,7 +66,7 @@ frontend:
# BACKEND # BACKEND
############################################################################# #############################################################################
api: api:
image: joyent/copilot-api:1.8.5 image: joyent/copilot-api:1.8.6
mem_limit: 512m mem_limit: 512m
links: links:
- consul:consul - consul:consul
@ -83,7 +83,7 @@ api:
# Docker-compose wrapper # Docker-compose wrapper
# Create _env file from running ./setup.sh # Create _env file from running ./setup.sh
compose-api: compose-api:
image: joyent/copilot-compose:1.1.0 image: joyent/copilot-compose:1.0.0
links: links:
- consul:consul - consul:consul
expose: expose:

2
docker/api/package.json
View File

@ -21,7 +21,7 @@
"joi": "^10.6.0", "joi": "^10.6.0",
"joyent-cp-gql-schema": "^1.7.0", "joyent-cp-gql-schema": "^1.7.0",
"piloted": "^3.1.1", "piloted": "^3.1.1",
"portal-api": "^1.8.5", "portal-api": "^1.8.6",
"toppsy": "^1.1.0", "toppsy": "^1.1.0",
"triton": "^5.2.0" "triton": "^5.2.0"
} }

4
packages/portal-api/lib/watch/machines.js
View File

@ -341,6 +341,10 @@ module.exports = class MachineWatcher {
}; };
const toBeActiveServiceResolver = (cb) => { const toBeActiveServiceResolver = (cb) => {
if (!version || !version.plan) {
return cb();
}
VAsync.forEachParallel({ VAsync.forEachParallel({
inputs: version.plan, inputs: version.plan,
func: (action, next) => { func: (action, next) => {

2
packages/portal-api/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "portal-api", "name": "portal-api",
"version": "1.8.5", "version": "1.8.6",
"description": "", "description": "",
"main": "./lib/index.js", "main": "./lib/index.js",
"scripts": { "scripts": {

2
triton-compose.yml
View File

@ -81,7 +81,7 @@ frontend:
# BACKEND # BACKEND
############################################################################# #############################################################################
api: api:
image: joyent/copilot-api:1.8.5 image: joyent/copilot-api:1.8.6
mem_limit: 1g mem_limit: 1g
expose: expose:
- 3000 - 3000