mirror of https://github.com/docker/docs.git
Displays host url and ports properly in app settings.
This commit is contained in:
parent
2a547f87c6
commit
ed80c00df7
|
@ -10,9 +10,19 @@
|
||||||
<label>Host URL</label>
|
<label>Host URL</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-8">
|
<div class="col-xs-8">
|
||||||
{{url}}
|
{{hostUrl}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{#if ports}}
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xs-3">
|
||||||
|
<label>Ports</label>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-8">
|
||||||
|
{{ports}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-3">
|
<div class="col-xs-3">
|
||||||
<label>Status</label>
|
<label>Status</label>
|
||||||
|
|
|
@ -59,6 +59,21 @@ Apps.helpers({
|
||||||
image: function () {
|
image: function () {
|
||||||
return Images.findOne(this.imageId);
|
return Images.findOne(this.imageId);
|
||||||
},
|
},
|
||||||
|
hostUrl: function () {
|
||||||
|
return this.name + '.dev';
|
||||||
|
},
|
||||||
|
ports: function () {
|
||||||
|
var app = this;
|
||||||
|
if (app.docker && app.docker.NetworkSettings.Ports) {
|
||||||
|
var ports = _.map(_.keys(app.docker.NetworkSettings.Ports), function (portObj) {
|
||||||
|
var port = parseInt(portObj.split('/')[0], 10);
|
||||||
|
return port;
|
||||||
|
});
|
||||||
|
return ports.join(', ');
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
},
|
||||||
url: function () {
|
url: function () {
|
||||||
var app = this;
|
var app = this;
|
||||||
var image = Images.findOne(app.imageId);
|
var image = Images.findOne(app.imageId);
|
||||||
|
|
|
@ -94,7 +94,7 @@ runContainer = function (app, image, callback) {
|
||||||
if (err) { callback(err, null); return; }
|
if (err) { callback(err, null); return; }
|
||||||
console.log('Started container: ' + container.id);
|
console.log('Started container: ' + container.id);
|
||||||
// Use dig to refresh the DNS
|
// Use dig to refresh the DNS
|
||||||
exec('/usr/bin/dig dig ' + app.name + '.dev @172.17.42.1 ', function(err, out, code) {
|
exec('/usr/bin/dig dig ' + app.name + '.dev @172.17.42.1 ', function(err, out) {
|
||||||
console.log(out);
|
console.log(out);
|
||||||
});
|
});
|
||||||
callback(null, container);
|
callback(null, container);
|
||||||
|
@ -147,7 +147,7 @@ restartApp = function (app, callback) {
|
||||||
callback(null);
|
callback(null);
|
||||||
|
|
||||||
// Use dig to refresh the DNS
|
// Use dig to refresh the DNS
|
||||||
exec('/usr/bin/dig dig ' + app.name + '.dev @172.17.42.1 ', function(err, out, code) {
|
exec('/usr/bin/dig dig ' + app.name + '.dev @172.17.42.1 ', function(err, out) {
|
||||||
console.log(out);
|
console.log(out);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue