mirror of https://github.com/docker/docs.git
Does not run pulling again if image already exists.
This commit is contained in:
parent
ff87fbdc29
commit
d0c6939ad6
|
@ -502,7 +502,13 @@ killAndRemoveContainers = function (names, callback) {
|
||||||
pullImageFromDockerfile = function (dockerfile, imageId, callback) {
|
pullImageFromDockerfile = function (dockerfile, imageId, callback) {
|
||||||
var fromImage = getFromImage(dockerfile);
|
var fromImage = getFromImage(dockerfile);
|
||||||
console.log('From image: ' + fromImage);
|
console.log('From image: ' + fromImage);
|
||||||
if (fromImage) {
|
var installedImage = null;
|
||||||
|
try {
|
||||||
|
installedImage = getImageDataSync(fromImage);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
}
|
||||||
|
if (fromImage && !installedImage) {
|
||||||
Fiber(function () {
|
Fiber(function () {
|
||||||
Images.update(imageId, {
|
Images.update(imageId, {
|
||||||
$set: {
|
$set: {
|
||||||
|
@ -542,6 +548,8 @@ pullImageFromDockerfile = function (dockerfile, imageId, callback) {
|
||||||
callback(null);
|
callback(null);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
callback(null);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue