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

Remove intrinsicFqdn

Browse Source
This commit is contained in:
Johannes Zellner
2018-02-08 15:07:49 +01:00
parent fa65576688
commit b6384d5025
12 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/docker.js
View File

@@ -49,10 +49,9 @@ var addons = require('./addons.js'),
_ = require('underscore');
function debugApp(app, args) {
assert(!app || typeof app === 'object');
assert(typeof app === 'object');
var prefix = app ? app.intrinsicFqdn : '(no app)';
debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
}
function pullImage(manifest, callback) {
@@ -129,7 +128,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
var manifest = app.manifest;
var exposedPorts = {}, dockerPortBindings = { };
var domain = app.intrinsicFqdn;
var domain = app.fqdn;
var stdEnv = [
'CLOUDRON=1',
'WEBADMIN_ORIGIN=' + config.adminOrigin(),
@@ -186,7 +185,7 @@ function createSubcontainer(app, name, cmd, options, callback) {
'/run': {}
},
Labels: {
'fqdn': app.intrinsicFqdn,
'fqdn': app.fqdn,
'appId': app.id,
'isSubcontainer': String(!isAppContainer)
},