From b9a089180db1bc4b67a9f89e1370cb4fd06b7563 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Wed, 1 Oct 2014 13:31:08 -0700 Subject: [PATCH] Updated version and sync image name and tag. --- meteor/.meteor/release | 2 +- meteor/.meteor/versions | 67 +++++++++++++++++++--------------- meteor/client/lib/imageutil.js | 17 ++++++++- 3 files changed, 54 insertions(+), 32 deletions(-) diff --git a/meteor/.meteor/release b/meteor/.meteor/release index 8f6f45d174..01887b6a68 100755 --- a/meteor/.meteor/release +++ b/meteor/.meteor/release @@ -1 +1 @@ -METEOR@0.9.1.1 +METEOR@0.9.3.1 diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions index cd174d525a..7133b02b45 100644 --- a/meteor/.meteor/versions +++ b/meteor/.meteor/versions @@ -1,54 +1,61 @@ -application-configuration@1.0.1 -autoupdate@1.0.6 +application-configuration@1.0.2 +autoupdate@1.1.1 +base64@1.0.0 binary-heap@1.0.0 blaze-tools@1.0.0 -blaze@2.0.0 +blaze@2.0.1 +boilerplate-generator@1.0.0 callback-hook@1.0.0 -check@1.0.0 +check@1.0.1 ctl-helper@1.0.3 ctl@1.0.1 dburles:collection-helpers@1.0.0 -ddp@1.0.8 -deps@1.0.3 -ejson@1.0.1 +ddp@1.0.9 +deps@1.0.4 +ejson@1.0.3 +fastclick@1.0.0 follower-livedata@1.0.1 geojson-utils@1.0.0 -html-tools@1.0.0 -htmljs@1.0.0 +html-tools@1.0.1 +htmljs@1.0.1 +http@1.0.6 id-map@1.0.0 iron:core@0.3.4 iron:dynamic-template@0.4.1 iron:layout@0.4.1 -iron:router@0.9.3 +iron:router@0.9.4 jquery@1.0.0 json@1.0.0 -less@1.0.7 -livedata@1.0.9 -logging@1.0.2 -meteor-platform@1.0.2 -meteor@1.0.3 -minifiers@1.0.2 -minimongo@1.0.2 -mongo-livedata@1.0.4 -mongo@1.0.4 +less@1.0.9 +livedata@1.0.10 +logging@1.0.3 +meteor-platform@1.1.1 +meteor@1.1.1 +minifiers@1.1.0 +minimongo@1.0.3 +mobile-status-bar@1.0.0 +mongo-livedata@1.0.5 +mongo@1.0.6 mrt:underscore-string-latest@2.3.3 observe-sequence@1.0.2 ordered-dict@1.0.0 -raix:handlebar-helpers@0.1.2 +raix:handlebar-helpers@0.1.3 random@1.0.0 -reactive-dict@1.0.2 -reactive-var@1.0.1 -reload@1.0.1 +reactive-dict@1.0.3 +reactive-var@1.0.2 +reload@1.1.0 retry@1.0.0 reywood:iron-router-ga@0.3.2 -routepolicy@1.0.0 -session@1.0.1 +routepolicy@1.0.1 +session@1.0.2 simison:bootstrap3-less@0.3.0 spacebars-compiler@1.0.2 -spacebars@1.0.1 -standard-app-packages@1.0.1 -templating@1.0.5 +spacebars@1.0.2 +standard-app-packages@1.0.2 +templating@1.0.7 tracker@1.0.2 -ui@1.0.2 +ui@1.0.3 underscore@1.0.0 -webapp@1.0.3 +url@1.0.0 +webapp-hashing@1.0.0 +webapp@1.1.2 diff --git a/meteor/client/lib/imageutil.js b/meteor/client/lib/imageutil.js index c7d5d1f718..1cd5ac45fe 100644 --- a/meteor/client/lib/imageutil.js +++ b/meteor/client/lib/imageutil.js @@ -277,10 +277,25 @@ ImageUtil.sync = function () { var images = Images.find({}).fetch(); _.each(images, function (image) { if (image.docker && image.docker.Id) { + var imageData = _.find(dockerImages, function (dockerImage) { + return dockerImage.Id === image.docker.Id; + }); + if (imageData && imageData.RepoTags) { + var repoTag = _.first(imageData.RepoTags); + var repoTagTokens = repoTag.split(':'); + var name = repoTagTokens[0]; + var version = repoTagTokens[1]; + Images.update(image._id, { + $set: { + 'meta.name': name, + 'meta.version': version + } + }); + } Docker.getImageData(image.docker.Id, function (err, data) { Images.update(image._id, { $set: { - docker: data, + docker: data } }) });