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

Fixed bugs with image state syncing.

This commit is contained in:
Sean Li 2014-09-30 17:14:34 -07:00
parent 0ea57733cd
commit 78c2fd09fe
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,16 +291,10 @@ ImageUtil.sync = function () {
return image.docker.Id; return image.docker.Id;
} }
}); });
console.log('Doc Ids');
console.log(dockerIds);
var imageIds = _.map(dockerImages, function (image) { var imageIds = _.map(dockerImages, function (image) {
return image.Id; return image.Id;
}); });
console.log('Host Ids');
console.log(imageIds);
var diffImages = _.difference(dockerIds, imageIds); var diffImages = _.difference(dockerIds, imageIds);
console.log('Dangling Ids');
console.log(diffImages);
_.each(diffImages, function (imageId) { _.each(diffImages, function (imageId) {
var image = Images.findOne({'docker.Id': imageId}); var image = Images.findOne({'docker.Id': imageId});
if (image && image.status !== 'BUILDING') { if (image && image.status !== 'BUILDING') {
@ -310,8 +304,6 @@ ImageUtil.sync = function () {
var diffDockerImages = _.reject(dockerImages, function (image) { var diffDockerImages = _.reject(dockerImages, function (image) {
return _.contains(dockerIds, image.Id); return _.contains(dockerIds, image.Id);
}); });
console.log('To be added:');
console.log(diffDockerImages);
_.each(diffDockerImages, function (image) { _.each(diffDockerImages, function (image) {
var repoTag = _.first(image.RepoTags); var repoTag = _.first(image.RepoTags);
var repoTagTokens = repoTag.split(':'); var repoTagTokens = repoTag.split(':');

2
meteor/client/views/dashboard/images/dashboard-images.js
View File

@ -1,5 +1,5 @@
Template.dashboard_images.helpers({ Template.dashboard_images.helpers({
images: function () { images: function () {
return Images.find({}, {sort: {createdAt: -1}}); return Images.find({'meta.name': {$ne: 'kite-dns'}}, {sort: {createdAt: -1}});
} }
}); });

4
meteor/client/views/dashboard/images/dashboard-single-image.html
View File

@ -18,7 +18,7 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
<a onclick="trackLink('image detail')" href="/images/{{_id}}" class="name">{{meta.name}}</a> <a onclick="trackLink('image detail')" href="/images/{{_id}}" class="name">{{meta.name}}:{{meta.version}}</a>
{{#if $eq status 'BUILDING'}} {{#if $eq status 'BUILDING'}}
<small>Creating image. This may take a couple minutes...</small> <small>Creating image. This may take a couple minutes...</small>
{{else}} {{else}}
@ -29,7 +29,9 @@
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}
<a onclick="trackLink('create app from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App"><span class="typcn typcn-plus-outline"></span></a> <a onclick="trackLink('create app from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App"><span class="typcn typcn-plus-outline"></span></a>
{{/if}} {{/if}}
{{#if originPath}}
<a onclick="trackLink('open image folder')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a> <a onclick="trackLink('open image folder')" href="#" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
{{/if}}
{{#if $neq status 'BUILDING'}} {{#if $neq status 'BUILDING'}}
<a onclick="trackLink('rebuild image')" href="#" class="btn-icon btn-rebuild" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Rebuild"><span class="typcn typcn-refresh-outline"></span></a> <a onclick="trackLink('rebuild image')" href="#" class="btn-icon btn-rebuild" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Rebuild"><span class="typcn typcn-refresh-outline"></span></a>
{{/if}} {{/if}}

2
meteor/client/views/dashboard/layouts/dashboard-images-layout.html
View File

@ -14,7 +14,9 @@
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}
<a onclick="trackLink('create app from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App" data-container="body"><span class="typcn typcn-plus-outline"></span></a> <a onclick="trackLink('create app from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
{{/if}} {{/if}}
{{#if originPath}}
<a onclick="trackLink('open image folder')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a> <a onclick="trackLink('open image folder')" href="#" class="btn-folder" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
{{/if}}
{{#if $neq status 'BUILDING'}} {{#if $neq status 'BUILDING'}}
<a onclick="trackLink('rebuild image')" href="#" class="btn-rebuild" data-toggle="tooltip" data-placement="bottom" title="Rebuild" data-container="body"><span class="typcn typcn-refresh-outline"></span></a> <a onclick="trackLink('rebuild image')" href="#" class="btn-rebuild" data-toggle="tooltip" data-placement="bottom" title="Rebuild" data-container="body"><span class="typcn typcn-refresh-outline"></span></a>
{{/if}} {{/if}}