Merge branch 'dns-fixes' into 'master'

Set DNS per container rather than the daemon

Closes #307

See merge request !6
This commit is contained in:
Girish Ramakrishnan
2017-04-25 17:06:31 +00:00
4 changed files with 14 additions and 2 deletions

View File

@@ -203,6 +203,8 @@ 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
DnsSearch: ['.'], // use internal dns
SecurityOpt: enableSecurityOpt ? [ "apparmor:docker-cloudron-app" ] : null // profile available only on cloudron
}
};