diff --git a/setup/start.sh b/setup/start.sh index 863bd3236..9b7f40ebf 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" > "${temp_file}" systemctl enable docker # restart docker if options changed diff --git a/src/docker.js b/src/docker.js index 51df8f9fb..4b55a8926 100644 --- a/src/docker.js +++ b/src/docker.js @@ -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 } }; diff --git a/src/infra_version.js b/src/infra_version.js index 8e2c6987a..53a33de26 100644 --- a/src/infra_version.js +++ b/src/infra_version.js @@ -7,7 +7,7 @@ exports = module.exports = { // a major version makes all apps restore from backup // a minor version makes all apps re-configure themselves - 'version': '48.1.0', + 'version': '48.2.0', 'baseImages': [ 'cloudron/base:0.10.0' ], diff --git a/src/platform.js b/src/platform.js index 75cc5fd18..3f8151f07 100644 --- a/src/platform.js +++ b/src/platform.js @@ -141,6 +141,8 @@ function startGraphite(callback) { --net-alias graphite \ -m 75m \ --memory-swap 150m \ + --dns 172.18.0.1 \ + --dns-search=. \ -p 127.0.0.1:2003:2003 \ -p 127.0.0.1:2004:2004 \ -p 127.0.0.1:8000:8000 \ @@ -168,6 +170,8 @@ function startMysql(callback) { --net-alias mysql \ -m ${memoryLimit}m \ --memory-swap ${memoryLimit * 2}m \ + --dns 172.18.0.1 \ + --dns-search=. \ -v "${dataDir}/mysql:/var/lib/mysql" \ -v "${dataDir}/addons/mysql_vars.sh:/etc/mysql/mysql_vars.sh:ro" \ --read-only -v /tmp -v /run "${tag}"`; @@ -192,6 +196,8 @@ function startPostgresql(callback) { --net-alias postgresql \ -m ${memoryLimit}m \ --memory-swap ${memoryLimit * 2}m \ + --dns 172.18.0.1 \ + --dns-search=. \ -v "${dataDir}/postgresql:/var/lib/postgresql" \ -v "${dataDir}/addons/postgresql_vars.sh:/etc/postgresql/postgresql_vars.sh:ro" \ --read-only -v /tmp -v /run "${tag}"`; @@ -216,6 +222,8 @@ function startMongodb(callback) { --net-alias mongodb \ -m ${memoryLimit}m \ --memory-swap ${memoryLimit * 2}m \ + --dns 172.18.0.1 \ + --dns-search=. \ -v "${dataDir}/mongodb:/var/lib/mongodb" \ -v "${dataDir}/addons/mongodb_vars.sh:/etc/mongodb_vars.sh:ro" \ --read-only -v /tmp -v /run "${tag}"`; @@ -277,6 +285,8 @@ function startMail(callback) { --net-alias mail \ -m ${memoryLimit}m \ --memory-swap ${memoryLimit * 2}m \ + --dns 172.18.0.1 \ + --dns-search=. \ --env ENABLE_MDA=${mailConfig.enabled} \ -v "${dataDir}/mail:/app/data" \ -v "${dataDir}/addons/mail:/etc/mail" \