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

Make docker restartable

Browse Source
This commit is contained in:
Johannes Zellner
2018-11-23 15:49:47 +01:00
parent b9c9839bb7
commit 161a8fe2bf
5 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/docker.js
View File

@@ -28,18 +28,19 @@ exports = module.exports = {
clearVolume: clearVolume
};
function connectionInstance() {
// timeout is optional
function connectionInstance(timeout) {
var Docker = require('dockerode');
var docker;
if (process.env.BOX_ENV === 'test') {
// test code runs a docker proxy on this port
docker = new Docker({ host: 'http://localhost', port: 5687 });
docker = new Docker({ host: 'http://localhost', port: 5687, timeout: timeout });
// proxy code uses this to route to the real docker
docker.options = { socketPath: '/var/run/docker.sock' };
} else {
docker = new Docker({ socketPath: '/var/run/docker.sock' });
docker = new Docker({ socketPath: '/var/run/docker.sock', timeout: timeout });
}
return docker;
@@ -112,7 +113,8 @@ function setRegistryConfig(auth, callback) {
function ping(callback) {
assert.strictEqual(typeof callback, 'function');
var docker = exports.connection;
// do not let the request linger
var docker = connectionInstance(1000);
docker.ping(function (error, result) {
if (error) return callback(new DockerError(DockerError.INTERNAL_ERROR, error));