From d0c6939ad62fb425f5c32aa7fe4936b1f677b66b Mon Sep 17 00:00:00 2001 From: Sean Li Date: Thu, 28 Aug 2014 00:39:33 -0700 Subject: [PATCH] Does not run pulling again if image already exists. --- meteor/server/docker.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meteor/server/docker.js b/meteor/server/docker.js index 2127ed8be4..3e5228dead 100755 --- a/meteor/server/docker.js +++ b/meteor/server/docker.js @@ -502,7 +502,13 @@ killAndRemoveContainers = function (names, callback) { pullImageFromDockerfile = function (dockerfile, imageId, callback) { var fromImage = getFromImage(dockerfile); console.log('From image: ' + fromImage); - if (fromImage) { + var installedImage = null; + try { + installedImage = getImageDataSync(fromImage); + } catch (e) { + console.error(e); + } + if (fromImage && !installedImage) { Fiber(function () { Images.update(imageId, { $set: { @@ -542,6 +548,8 @@ pullImageFromDockerfile = function (dockerfile, imageId, callback) { callback(null); }); }); + } else { + callback(null); } };