Skip to content

Hotfix dedupe #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 15, 2015
Merged

Hotfix dedupe #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
817da96
remove version update from createImageBuilderAndAttach
anandkumarpatel Jan 15, 2015
f47e892
build error fix
anandkumarpatel Jan 15, 2015
90f29fa
use cv.build._id as buildContainerName so we can get rid of cv.contai…
tjmehta Jan 15, 2015
e796660
Merge branch 'hotfix-dedupe' of github.com:CodeNow/api into hotfix-de…
tjmehta Jan 15, 2015
f85fb8f
move container name to create vs start
tjmehta Jan 15, 2015
74e490f
toString ObjectId before querystring
tjmehta Jan 15, 2015
b4aa7bf
docker-mock@0.5.7
tjmehta Jan 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions lib/models/apis/docker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Docker.prototype.createImageBuilderAndAttach = function (sessionUser, version, c
var self = this;
debug('create container');
var builderContainerData = {
name: version.build._id.toString(),
Image: process.env.DOCKER_IMAGE_BUILDER_NAME + ':' + process.env.DOCKER_IMAGE_BUILDER_VERSION,
Env : getEnvForImageBuilder(version, dockerTag),
Binds: []
Expand All @@ -127,17 +128,7 @@ Docker.prototype.createImageBuilderAndAttach = function (sessionUser, version, c
'/cache': {}
};
}
self.createContainer(builderContainerData, function (err, container) {
debug('container created - ', 'err:', err, 'container:', container);
if (err) { return cb(err); }
var containerId = container.Id;

version.update({
$set: { containerId: containerId }
}, error.logIfErr);

cb(null, container);
});
self.createContainer(builderContainerData, cb);
}
};

Expand Down
7 changes: 6 additions & 1 deletion lib/models/mongo/context-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,13 @@ ContextVersionSchema.methods.setBuildStarted = function (user, dockerHost, build
buildProps = {};
}
var update = {};
// FIXME: lets get rid of cv.containerId soon (now mirrors build._id)
// - used for buildLogs (change to build._id)
update.$set = {
'build.started' : Date.now(),
'build.triggeredBy.github': user.accounts.github.id,
'dockerHost': dockerHost
'dockerHost': dockerHost,
'containerId': this.build._id
};
Object.keys(buildProps).forEach(function (key) {
update.$set['build.'+key] = buildProps[key];
Expand Down Expand Up @@ -813,6 +816,8 @@ ContextVersionSchema.methods.copyBuildFromContextVersion = function (contextVers
var self = this;
self.build.dupeFound = true;
self.containerId = contextVersion.containerId;
// FIXME: lets get rid of cv.containerId soon (now mirrors build._id)
// - used for buildLogs (change to build._id)
self.update({
$set: {
'build': contextVersion.build,
Expand Down
6 changes: 1 addition & 5 deletions lib/routes/builds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ var checkFound = require('middlewares/check-found');
var Boom = mw.Boom;
var runnable = require('middlewares/apis').runnable;
var error = require('error');
var createCount = require('callback-count');
var pluck = require('101/pluck');
var noop = require('101/noop');

Expand Down Expand Up @@ -237,11 +236,8 @@ app.post('/builds/:id/actions/build',
).catch(
function (err, req, res, next) {
error.log(err, req);
var count = createCount(2, next);
req.contextVersion.updateBuildError(err,
logIfErrAndNext(count.next.bind(count)));
req.build.modifyErrored(req.contextVersion._id,
logIfErrAndNext(count.next.bind(count)));
logIfErrAndNext(next));
}
)
),
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"Filibuster": "git://github.com/Runnable/Filibuster.git#v0.1.4",
"console-trace": "git://github.com/numbcoder/console-trace.git",
"docker-listener": "git+ssh://git@github.com:codenow/docker-listener#v0.1.1",
"docker-mock": "^0.5.5",
"docker-mock": "^0.5.7",
"faker": "^1.0.0",
"form-data": "^0.1.4",
"function-proxy": "^0.5.2",
Expand Down