github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(container-creation): let Docker assign a port when host port is not specified (#264)

pull/267/head
Anthony Lapenna 2016-10-07 18:08:07 +13:00 committed by GitHub
parent 35ced4901a
commit 44e09ecadf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/createContainer/createContainerController.js
View File

@ -156,10 +156,10 @@ function ($scope, $state, Config, Info, Container, Image, Volume, Network, Messa
function preparePortBindings(config) { function preparePortBindings(config) {
var bindings = {}; var bindings = {};
config.HostConfig.PortBindings.forEach(function (portBinding) { config.HostConfig.PortBindings.forEach(function (portBinding) {
if (portBinding.hostPort && portBinding.containerPort) { if (portBinding.containerPort) {
var key = portBinding.containerPort + "/" + portBinding.protocol; var key = portBinding.containerPort + "/" + portBinding.protocol;
var binding = {}; var binding = {};
if (portBinding.hostPort.indexOf(':') > -1) { if (portBinding.hostPort && portBinding.hostPort.indexOf(':') > -1) {
var hostAndPort = portBinding.hostPort.split(':'); var hostAndPort = portBinding.hostPort.split(':');
binding.HostIp = hostAndPort[0]; binding.HostIp = hostAndPort[0];
binding.HostPort = hostAndPort[1]; binding.HostPort = hostAndPort[1];

2
app/components/createContainer/createcontainer.html
View File

@ -69,7 +69,7 @@
<div ng-repeat="portBinding in config.HostConfig.PortBindings" style="margin-top: 2px;"> <div ng-repeat="portBinding in config.HostConfig.PortBindings" style="margin-top: 2px;">
<div class="input-group col-sm-5 input-group-sm"> <div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">host</span> <span class="input-group-addon">host</span>
<input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80"> <input type="text" class="form-control" ng-model="portBinding.hostPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)">
</div> </div>
<div class="input-group col-sm-5 input-group-sm"> <div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">container</span> <span class="input-group-addon">container</span>