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

fix deltas by not using the supervisor as source

Browse Source
This commit is contained in:
Pablo Carranza Velez 2016-06-10 17:22:52 -03:00
parent f69e635196
commit 6e39128f3a
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,3 +1,5 @@
* fix deltas by not using the supervisor as source [Pablo]
# v1.11.2 # v1.11.2
* fix delta error handling by listening for the 'error' event [petrosagg] * fix delta error handling by listening for the 'error' event [petrosagg]

13
src/docker-utils.coffee
View File

@ -42,18 +42,7 @@ findSimilarImage = (repoTag) ->
if otherApplication is application if otherApplication is application
return repoTag[0] return repoTag[0]
# Otherwise return the image for the most specific supervisor tag (commit hash) # Otherwise we start from scratch
for repoTag in repoTags when /resin\/.*-supervisor.*:[0-9a-f]{6}/.test(repoTag[0])
return repoTag[0]
# Or return *any* supervisor image available (except latest which is usually a phony tag)
for repoTag in repoTags when /resin\/.*-supervisor.*:(?!latest)/.test(repoTag[0])
return repoTag[0]
# If all else fails, return the newest image available
for repoTag in repoTags when repoTag[0] isnt '<none>:<none>'
return repoTag[0]
return 'resin/scratch' return 'resin/scratch'
DELTA_REQUEST_TIMEOUT = 15 * 60 * 1000 DELTA_REQUEST_TIMEOUT = 15 * 60 * 1000