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

docker container can use system dns

Browse Source 
only mail container needs unbound for dnsbl
This commit is contained in:
Girish Ramakrishnan
2024-04-29 15:33:34 +02:00
parent ad2eaff60e
commit e98a1a9767
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services.js
+4 -15
View File
@@ -275,7 +275,8 @@ const APP_SERVICES = {
function requiresUpgrade(existingObjOrImageName, currentImageName) {
// we removed image.tag. remove this after 7.6
const existingTag = typeof existingObjOrImageName === 'object' ? existingObjOrImageName.tag : existingObjOrImageName;
let etag = docker.parseImageName(existingTag), ctag = docker.parseImageName(currentImageName);
const etag = docker.parseImageName(existingTag),
ctag = docker.parseImageName(currentImageName);
return etag.version.major !== ctag.version.major;
}
@@ -340,7 +341,7 @@ async function listServices() {
const serviceIds = Object.keys(SERVICES);
const result = await apps.list();
for (let app of result) {
for (const app of result) {
if (app.manifest.addons?.redis && app.enableRedis) serviceIds.push(`redis:${app.id}`);
}
@@ -827,7 +828,7 @@ async function getEnvironment(app) {
result.forEach(e => { env[e.name] = e.value; });
// get environment configs which are dynamic e.g generated based on dashboard domain and are not stored in db
for (let addon in (app.manifest.addons || {})) {
for (const addon in (app.manifest.addons || {})) {
const configs = await ADDONS[addon].getDynamicEnvironment(app, {});
if (configs) env = { ...env, ...configs };
}
@@ -947,8 +948,6 @@ async function startTurn(existingInfra) {
--log-opt tag=turn \
-m ${memoryLimit} \
--memory-swap -1 \
--dns 172.18.0.1 \
--dns-search=. \
-e CLOUDRON_TURN_SECRET=${turnSecret} \
-e CLOUDRON_REALM=${realm} \
--label isCloudronManaged=true \
@@ -1153,8 +1152,6 @@ async function startMysql(existingInfra) {
--log-opt syslog-address=unix://${paths.SYSLOG_SOCKET_FILE} \
--log-opt syslog-format=rfc5424 \
--log-opt tag=mysql \
--dns 172.18.0.1 \
--dns-search=. \
--ip ${constants.MYSQL_SERVICE_IPv4} \
-e CLOUDRON_MYSQL_TOKEN=${cloudronToken} \
-e CLOUDRON_MYSQL_ROOT_HOST=172.18.0.1 \
@@ -1374,8 +1371,6 @@ async function startPostgresql(existingInfra) {
--log-opt syslog-address=unix://${paths.SYSLOG_SOCKET_FILE} \
--log-opt syslog-format=rfc5424 \
--log-opt tag=postgresql \
--dns 172.18.0.1 \
--dns-search=. \
--ip ${constants.POSTGRESQL_SERVICE_IPv4} \
--shm-size=128M \
-e CLOUDRON_POSTGRESQL_ROOT_PASSWORD=${rootPassword} \
@@ -1527,8 +1522,6 @@ async function startMongodb(existingInfra) {
--log-opt syslog-address=unix://${paths.SYSLOG_SOCKET_FILE} \
--log-opt syslog-format=rfc5424 \
--log-opt tag=mongodb \
--dns 172.18.0.1 \
--dns-search=. \
--ip ${constants.MONGODB_SERVICE_IPv4} \
-e CLOUDRON_MONGODB_ROOT_PASSWORD=${rootPassword} \
-e CLOUDRON_MONGODB_TOKEN=${cloudronToken} \
@@ -1705,8 +1698,6 @@ async function startGraphite(existingInfra) {
--log-opt tag=graphite \
-m ${memoryLimit} \
--memory-swap -1 \
--dns 172.18.0.1 \
--dns-search=. \
-p 127.0.0.1:2003:2003 \
-v ${paths.PLATFORM_DATA_DIR}/graphite:/var/lib/graphite \
--label isCloudronManaged=true \
@@ -1849,8 +1840,6 @@ async function setupRedis(app, options) {
--log-opt tag=${redisName} \
-m ${memoryLimit} \
--memory-swap -1 \
--dns 172.18.0.1 \
--dns-search=. \
-e CLOUDRON_REDIS_PASSWORD=${redisPassword} \
-e CLOUDRON_REDIS_TOKEN=${redisServiceToken} \
-v ${paths.PLATFORM_DATA_DIR}/redis/${app.id}:/var/lib/redis \