Use docker proxy over DOCKER_URL env var when docker addon is used

This commit is contained in:
Johannes Zellner
2018-08-13 20:47:15 +02:00
parent 10f0d48b2a
commit 14f0f954b7

View File

@@ -205,6 +205,8 @@ function getEnvironment(app, callback) {
appdb.getAddonConfigByAppId(app.id, function (error, result) {
if (error) return callback(error);
if (app.manifest.addons['docker']) result.push({ name: 'DOCKER_URL', value: `tcp://172.18.0.1:${config.get('dockerProxyPort')}` });
return callback(null, result.map(function (e) { return e.name + '=' + e.value; }));
});
}
@@ -219,7 +221,6 @@ function getBindsSync(app, addons) {
for (let addon in addons) {
switch (addon) {
case 'docker': binds.push('/var/run/docker.sock:/var/run/docker.sock:rw'); break;
case 'localstorage':
binds.push(path.join(paths.APPS_DATA_DIR, app.id, 'data') + ':/app/data:rw');
if (!Array.isArray(addons[addon].bindMounts)) break;