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

Merge pull request #158 from kitematic/jmorgan_bugfixes 

Important setup + image building bug fixes
This commit is contained in:
Jeffrey Morgan 2015-01-14 17:29:25 -05:00
parent ad8cfbe5a1 9991e355d3
commit f6f67ba647
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meteor/client/lib/boot2docker.js
View File

@ -23,7 +23,7 @@ Boot2Docker.exec = function (command, callback) {
Boot2Docker.exists = function (callback) { Boot2Docker.exists = function (callback) {
this.exec(['info'], function (stderr, stdout, code) { this.exec(['info'], function (stderr, stdout, code) {
if (stderr) { if (code) {
callback(null, false); callback(null, false);
} else { } else {
callback(null, true); callback(null, true);
@ -280,4 +280,4 @@ Boot2Docker.waitWhileStatus = function (status, callback) {
}, function (err) { }, function (err) {
callback(err); callback(err);
}); });
}; };

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

@ -29,21 +29,11 @@ var getImageJSON = function (directory) {
}; };
ImageUtil.getMetaData = function (directory) { ImageUtil.getMetaData = function (directory) {
var kiteJSON = getImageJSON(directory); var ret = {
if (kiteJSON) { name: _.last(directory.split(path.sep)).replace(/\s+/g, '-').toLowerCase(),
if (!kiteJSON.name) { version: 'latest'
kiteJSON.name = _.last(directory.split(path.sep)); };
} return ret;
if (!kiteJSON.version) {
kiteJSON.version = 'latest';
}
} else {
kiteJSON = {
name: _.last(directory.split(path.sep)),
version: 'latest'
};
}
return kiteJSON;
}; };
ImageUtil.rebuildHelper = function (image, callback) { ImageUtil.rebuildHelper = function (image, callback) {
@ -171,7 +161,7 @@ ImageUtil.build = function (image, callback) {
buildLogs: [] buildLogs: []
} }
}); });
Docker.client().buildImage(tarFilePath, {forcerm: true, t: image.meta.name + ':' + image.meta.version}, function (err, response) { Docker.client().buildImage(tarFilePath, {forcerm: true, t: image.tags}, function (err, response) {
if (err) { callback(err); return; } if (err) { callback(err); return; }
console.log('Building Docker image...'); console.log('Building Docker image...');
response.setEncoding('utf8'); response.setEncoding('utf8');
@ -196,7 +186,7 @@ ImageUtil.build = function (image, callback) {
console.error(e); console.error(e);
} }
var imageData = null; var imageData = null;
Docker.getImageData(image.meta.name + ':' + image.meta.version, function (err, data) { Docker.getImageData(image.tags, function (err, data) {
if (err) { if (err) {
console.error(err); console.error(err);
Images.update(image._id, { Images.update(image._id, {

10
meteor/client/views/dashboard/components/modal-create-image.js
View File

@ -48,7 +48,17 @@ Template.modalCreateImage.events({
}; };
var imageMetaData = ImageUtil.getMetaData(directory); var imageMetaData = ImageUtil.getMetaData(directory);
imageObj.meta = imageMetaData; imageObj.meta = imageMetaData;
var count = 2;
imageObj.tags = [imageMetaData.name + ':' + imageMetaData.version]; imageObj.tags = [imageMetaData.name + ':' + imageMetaData.version];
while (Images.findOne({tags: imageObj.tags})) {
imageObj.meta = {
name: imageMetaData.name + '-' + count,
version: imageMetaData.version
};
imageObj.tags = [imageMetaData.name + '-' + count + ':' + imageMetaData.version];
count++;
}
var imageId = Images.insert(imageObj); var imageId = Images.insert(imageObj);
$('#modal-create-image').modal('hide'); $('#modal-create-image').modal('hide');