jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not re-translate to DockerError

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-10-23 09:24:51 -07:00
parent b6f2c94464
commit d0e6b6bfe4
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/docker.js
View File

@@ -306,10 +306,10 @@ function createSubcontainer(app, name, cmd, options, callback) {
debugApp(app, 'Creating container for %s', app.manifest.dockerImage);
docker.createContainer(containerOptions, function (error) {
docker.createContainer(containerOptions, function (error, container) {
if (error) return callback(new BoxError(BoxError.DOCKER_ERROR, error));
callback();
callback(null, container);
});
});
}
@@ -453,9 +453,12 @@ function deleteImage(manifest, callback) {
if (error && error.statusCode === 404) return callback(null); // not found
if (error && error.statusCode === 409) return callback(null); // another container using the image
if (error) debug('Error removing image %s : %j', dockerImage, error);
if (error) {
debug('Error removing image %s : %j', dockerImage, error);
return callback(new BoxError(BoxError.DOCKER_ERROR, error));
}
callback(new BoxError(BoxError.DOCKER_ERROR, error));
callback(null);
});
}