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

move back docker network creation to start.sh

Browse Source 
dockerproxy and unbound rely on it.
This commit is contained in:
Girish Ramakrishnan
2020-11-20 17:22:54 -08:00
parent c0b0029935
commit 09c8248e31
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform.js
View File

@@ -55,7 +55,6 @@ function start(callback) {
async.series([
(next) => { if (existingInfra.version !== infra.version) removeAllContainers(next); else next(); },
createDockerNetwork,
markApps.bind(null, existingInfra), // mark app state before we start addons. this gives the db import logic a chance to mark an app as errored
graphs.startGraphite.bind(null, existingInfra),
sftp.startSftp.bind(null, existingInfra),
@@ -132,16 +131,6 @@ function removeAllContainers(callback) {
], callback);
}
function createDockerNetwork(callback) {
debug('createDockerNetwork: creating cloudron network');
// this gives docker the network range 172.18.0.0-172.18.15.255
async.series([
shell.exec.bind(null, 'createDockerNetwork', 'docker network rm cloudron || true'), // may not exist on first run
shell.exec.bind(null, 'createDockerNetwork', 'docker network create --subnet=172.18.0.0/16 --ip-range=172.18.0.0/20 cloudron || true') // can fail if (user) containers are still attached
], callback);
}
function markApps(existingInfra, callback) {
if (existingInfra.version === 'none') { // cloudron is being restored from backup
debug('markApps: restoring installed apps');