ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-19 19:28:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #529 via VersionBot

Browse Source 
When listenPort is not specified, use 48484 as default
This commit is contained in:
resin-io-versionbot[bot] 2017-12-01 21:05:26 +00:00 committed by GitHub
commit 481888fc8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v6.4.8 - 2017-12-01
* When listenPort is not specified, use 48484 as default #529 [Pablo Carranza Velez]
## v6.4.7 - 2017-11-20 ## v6.4.7 - 2017-11-20
* Sync.js: Fix command to build the source code without optimizations #527 [Pablo Carranza Velez] * Sync.js: Fix command to build the source code without optimizations #527 [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "6.4.7", "version": "6.4.8",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

2
src/config.coffee
View File

@ -7,7 +7,7 @@ apiEndpoint = checkString(process.env.API_ENDPOINT)
module.exports = module.exports =
apiEndpoint: apiEndpoint apiEndpoint: apiEndpoint
apiTimeout: checkInt(process.env.API_TIMEOUT, positive: true) ? 15 * 60 * 1000 apiTimeout: checkInt(process.env.API_TIMEOUT, positive: true) ? 15 * 60 * 1000
listenPort: checkInt(process.env.LISTEN_PORT, positive: true) ? 80 listenPort: checkInt(process.env.LISTEN_PORT, positive: true) ? 48484
gosuperAddress: "http://unix:#{process.env.GOSUPER_SOCKET}:" gosuperAddress: "http://unix:#{process.env.GOSUPER_SOCKET}:"
deltaHost: checkString(process.env.DELTA_ENDPOINT) ? 'https://delta.resin.io' deltaHost: checkString(process.env.DELTA_ENDPOINT) ? 'https://delta.resin.io'
registryEndpoint: checkString(process.env.REGISTRY_ENDPOINT) ? 'registry.resin.io' registryEndpoint: checkString(process.env.REGISTRY_ENDPOINT) ? 'registry.resin.io'