From ac7e7f0db9edc877c4f2e8f8aab92beb28eb4bbd Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Sat, 1 Jun 2019 10:48:17 -0700
Subject: [PATCH] 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
---
 src/docker.js        | 10 +++++++++-
 src/infra_version.js |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/docker.js b/src/docker.js
index a232c1d4c..c68c6e9a4 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -185,6 +185,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
     var stdEnv = [
         'CLOUDRON=1',
         'CLOUDRON_PROXY_IP=172.18.0.1',
+        `CLOUDRON_APP_HOSTNAME=${name}`,
         'WEBADMIN_ORIGIN=' + config.adminOrigin(),
         'API_ORIGIN=' + config.adminOrigin(),
         'APP_ORIGIN=https://' + domain,
@@ -237,7 +238,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
         var containerOptions = {
             name: name, // for referencing containers
             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,
             Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
             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
                 DnsSearch: ['.'], // use internal dns
                 SecurityOpt: [ 'apparmor=docker-cloudron-app' ]
+            },
+            NetworkingConfig: {
+                EndpointsConfig: {
+                    cloudron: {
+                        Aliases: [ name ] // this allows sub-containers reach app containers by name
+                    }
+                }
             }
         };
 
diff --git a/src/infra_version.js b/src/infra_version.js
index 55c5fbdfb..68e38fbd7 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -6,7 +6,7 @@
 
 exports = module.exports = {
     // a version change recreates all containers with latest docker config
-    'version': '48.14.0',
+    'version': '48.15.0',
 
     'baseImages': [
         { repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' }