mpana
/
copilot
mirror of https://github.com/yldio/copilot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: no longer ignore successful status checks

This commit is contained in:
Wyatt Preul 2017-09-18 17:00:41 -05:00 committed by Sérgio Ramos
parent ac2eab6cfe
commit 3c8b2b0c8f
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -72,7 +72,7 @@ frontend:
# BACKEND # BACKEND
############################################################################# #############################################################################
api: api:
image: joyent/copilot-api:1.8.15 image: joyent/copilot-api:1.8.16
mem_limit: 1g mem_limit: 1g
expose: expose:
- 3000 - 3000
@ -81,8 +81,6 @@ api:
- _env - _env
environment: environment:
- PORT=3000 - PORT=3000
ports:
- "8080:8080"
restart: always restart: always
# Docker-compose wrapper # Docker-compose wrapper

6
docker/api/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "api", "name": "api",
"version": "1.8.15", "version": "1.8.16",
"description": "", "description": "",
"main": "./server.js", "main": "./server.js",
"scripts": { "scripts": {
@ -19,9 +19,9 @@
"hapi": "^16.6.0", "hapi": "^16.6.0",
"hoek": "^4.1.1", "hoek": "^4.1.1",
"joi": "^10.6.0", "joi": "^10.6.0",
"joyent-cp-gql-schema": "^1.7.0", "joyent-cp-gql-schema": "^1.8.0",
"piloted": "^3.1.1", "piloted": "^3.1.1",
"portal-api": "^1.8.15", "portal-api": "^1.8.16",
"toppsy": "^1.1.0", "toppsy": "^1.1.0",
"triton": "^5.2.0" "triton": "^5.2.0"
} }

2
local-compose.yml
View File

@ -66,7 +66,7 @@ frontend:
# BACKEND # BACKEND
############################################################################# #############################################################################
api: api:
image: joyent/copilot-api:1.8.15 image: joyent/copilot-api:1.8.16
mem_limit: 512m mem_limit: 512m
links: links:
- consul:consul - consul:consul

2
packages/cp-gql-schema/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-cp-gql-schema", "name": "joyent-cp-gql-schema",
"version": "1.7.0", "version": "1.8.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/copilot", "repository": "github:yldio/copilot",
"main": "index.js", "main": "index.js",

2
packages/portal-api/lib/watch/container-pilot.js
View File

@ -167,7 +167,7 @@ module.exports = class ContainerPilotWatcher extends Events {
func: fetchStatus, func: fetchStatus,
inputs: machine.ips inputs: machine.ips
}, (err, results) => { }, (err, results) => {
if (err || !results.successes || !results.successes.length) { if (err && (!results.successes || !results.successes.length)) {
return cb(err); return cb(err);
} }

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

@ -1,6 +1,6 @@
{ {
"name": "portal-api", "name": "portal-api",
"version": "1.8.15", "version": "1.8.16",
"description": "", "description": "",
"main": "./lib/index.js", "main": "./lib/index.js",
"scripts": { "scripts": {
@ -39,7 +39,7 @@
"graphi": "^3.0.0", "graphi": "^3.0.0",
"hasha": "^3.0.0", "hasha": "^3.0.0",
"hoek": "^4.2.0", "hoek": "^4.2.0",
"joyent-cp-gql-schema": "^1.7.0", "joyent-cp-gql-schema": "^1.8.0",
"lodash.find": "^4.6.0", "lodash.find": "^4.6.0",
"lodash.flatten": "^4.4.0", "lodash.flatten": "^4.4.0",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",