Set name as the network alias for app containers
this allows scheduler containers to reach app containers by http https://forum.cloudron.io/topic/1082/bitwarden-self-hosted-password-manager
This commit is contained in:
+9
-1
@@ -185,6 +185,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
|
|||||||
var stdEnv = [
|
var stdEnv = [
|
||||||
'CLOUDRON=1',
|
'CLOUDRON=1',
|
||||||
'CLOUDRON_PROXY_IP=172.18.0.1',
|
'CLOUDRON_PROXY_IP=172.18.0.1',
|
||||||
|
`CLOUDRON_APP_HOSTNAME=${name}`,
|
||||||
'WEBADMIN_ORIGIN=' + config.adminOrigin(),
|
'WEBADMIN_ORIGIN=' + config.adminOrigin(),
|
||||||
'API_ORIGIN=' + config.adminOrigin(),
|
'API_ORIGIN=' + config.adminOrigin(),
|
||||||
'APP_ORIGIN=https://' + domain,
|
'APP_ORIGIN=https://' + domain,
|
||||||
@@ -237,7 +238,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
|
|||||||
var containerOptions = {
|
var containerOptions = {
|
||||||
name: name, // for referencing containers
|
name: name, // for referencing containers
|
||||||
Tty: isAppContainer,
|
Tty: isAppContainer,
|
||||||
Hostname: app.id, // set to something 'constant' so app containers can use this to communicate (across app updates)
|
Hostname: name,
|
||||||
Image: app.manifest.dockerImage,
|
Image: app.manifest.dockerImage,
|
||||||
Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
|
Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
|
||||||
Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv),
|
Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv),
|
||||||
@@ -277,6 +278,13 @@ function createSubcontainer(app, name, cmd, options, callback) {
|
|||||||
Dns: ['172.18.0.1'], // use internal dns
|
Dns: ['172.18.0.1'], // use internal dns
|
||||||
DnsSearch: ['.'], // use internal dns
|
DnsSearch: ['.'], // use internal dns
|
||||||
SecurityOpt: [ 'apparmor=docker-cloudron-app' ]
|
SecurityOpt: [ 'apparmor=docker-cloudron-app' ]
|
||||||
|
},
|
||||||
|
NetworkingConfig: {
|
||||||
|
EndpointsConfig: {
|
||||||
|
cloudron: {
|
||||||
|
Aliases: [ name ] // this allows sub-containers reach app containers by name
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
exports = module.exports = {
|
exports = module.exports = {
|
||||||
// a version change recreates all containers with latest docker config
|
// a version change recreates all containers with latest docker config
|
||||||
'version': '48.14.0',
|
'version': '48.15.0',
|
||||||
|
|
||||||
'baseImages': [
|
'baseImages': [
|
||||||
{ repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' }
|
{ repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' }
|
||||||
|
|||||||
Reference in New Issue
Block a user