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

Auto-merge for PR #536 via VersionBot

Browse Source 
gosuper: When getting IP addresses, ignore balena and the resin-dns bridge
This commit is contained in:
resin-io-versionbot[bot] 2017-12-12 10:47:12 +00:00 committed by GitHub
commit f965db86b5
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.5.3 - 2017-12-12
* Gosuper: When getting IP addresses, ignore balena and the resin-dns bridge #536 [Pablo Carranza Velez]
## v6.5.2 - 2017-12-12 ## v6.5.2 - 2017-12-12
* Dockerfile: improve caching by installing devDependencies before copying the code #535 [Pablo Carranza Velez] * Dockerfile: improve caching by installing devDependencies before copying the code #535 [Pablo Carranza Velez]

2
gosuper/gosuper/api.go
View File

@ -16,7 +16,7 @@ import (
// Compile the expression once, usually at init time. // Compile the expression once, usually at init time.
// Use raw strings to avoid having to quote the backslashes. // Use raw strings to avoid having to quote the backslashes.
var dockerMatch = regexp.MustCompile(`(docker[0-9]+)|(rce[0-9]+)|(tun[0-9]+)|(resin-vpn)`) var dockerMatch = regexp.MustCompile(`(balena[0-9]+)|(docker[0-9]+)|(rce[0-9]+)|(tun[0-9]+)|(resin-vpn)|(resin-dns)`)
// APIResponse The api response sent from go supervisor // APIResponse The api response sent from go supervisor
type APIResponse struct { type APIResponse struct {

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.5.2", "version": "6.5.3",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",