Merge branch 'master' into jmorgan_bump_0.4.3

This commit is contained in:
Jeff Morgan 2014-12-16 07:21:37 -08:00
commit e8696d7fd5
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -19,7 +19,7 @@
{{/if}}
{{/if}}
<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>
<div class="options">
{{#if $eq status 'READY'}}