docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jmorgan_bump_0.4.3

This commit is contained in:
Jeff Morgan 2014-12-16 07:21:37 -08:00
parent 630d233799 386b8bbc2c
commit e8696d7fd5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meteor/client/lib/imageutil.js
View File

@ -291,7 +291,7 @@ ImageUtil.sync = function (callback) {
docker: image, docker: image,
buildLogs: [], buildLogs: [],
createdAt: new Date(), createdAt: new Date(),
tags: image.RepoTags, tags: image.RepoTags.sort(),
meta: meta meta: meta
}; };
Images.insert(imageObj); Images.insert(imageObj);
@ -311,7 +311,7 @@ ImageUtil.sync = function (callback) {
if (imageData && imageData.RepoTags) { if (imageData && imageData.RepoTags) {
Images.update(image._id, { Images.update(image._id, {
$set: { $set: {
tags: imageData.RepoTags tags: imageData.RepoTags.sort()
} }
}); });
} }

2
meteor/client/views/dashboard/apps/dashboard-single-app.html
View File

@ -19,7 +19,7 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<a onclick="Metrics.trackEvent('container details')" href="/apps/{{name}}" class="name">{{name}}</a> <a onclick="Metrics.trackEvent('container details')" href="/apps/{{name}}" class="name">{{name}}</a>
<small><a onclick="Metrics.trackEvent('container view image details')" href="/images/{{image._id}}">{{displayTags image.tags}}</a></small> <small><a onclick="Metrics.trackEvent('container view image details')" href="/images/{{image._id}}">{{displayTags image.tags ', '}}</a></small>
</h5> </h5>
<div class="options"> <div class="options">
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}