diff --git a/setup/start.sh b/setup/start.sh index 343aad871..9154c0ee1 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -42,7 +42,7 @@ systemctl restart apparmor usermod ${USER} -a -G docker temp_file=$(mktemp) # create systemd drop-in. some apps do not work with aufs -echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=devicemapper --dns=172.18.0.1 --dns-search=." > "${temp_file}" +echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=devicemapper --dns-search=." > "${temp_file}" systemctl enable docker # restart docker if options changed diff --git a/src/docker.js b/src/docker.js index d2a26adf9..6c2f73f62 100644 --- a/src/docker.js +++ b/src/docker.js @@ -203,6 +203,7 @@ function createSubcontainer(app, name, cmd, options, callback) { CpuShares: 512, // relative to 1024 for system processes VolumesFrom: isAppContainer ? null : [ app.containerId + ":rw" ], NetworkMode: isAppContainer ? 'cloudron' : ('container:' + app.containerId), // share network namespace with parent + Dns: ['172.18.0.1'], // use internal dns SecurityOpt: enableSecurityOpt ? [ "apparmor:docker-cloudron-app" ] : null // profile available only on cloudron } };