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

Merge branch 'master' into events

pull/2/head
Kevan Ahlquist 2015-05-20 23:44:32 -05:00
parent ef3596ff32 419bf0aa77
commit e806214d0b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/components/startContainer/startContainerController.js
View File

@ -83,6 +83,9 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
var PortBindings = {}; var PortBindings = {};
config.HostConfig.PortBindings.forEach(function(portBinding) { config.HostConfig.PortBindings.forEach(function(portBinding) {
var intPort = portBinding.intPort + "/tcp"; var intPort = portBinding.intPort + "/tcp";
if (portBinding.protocol === "udp") {
intPort = portBinding.intPort + "/udp";
}
var binding = { var binding = {
HostIp: portBinding.ip, HostIp: portBinding.ip,
HostPort: portBinding.extPort HostPort: portBinding.extPort

4
app/components/startContainer/startcontainer.html
View File

@ -289,6 +289,10 @@
<input type="text" ng-model="portBinding.extPort" class="form-control" placeholder="Host Port"/> <input type="text" ng-model="portBinding.extPort" class="form-control" placeholder="Host Port"/>
<label class="sr-only">Container port:</label> <label class="sr-only">Container port:</label>
<input type="text" ng-model="portBinding.intPort" class="form-control" placeholder="Container Port"/> <input type="text" ng-model="portBinding.intPort" class="form-control" placeholder="Container Port"/>
<select ng-model="portBinding.protocol">
<option value="">tcp</option>
<option value="udp">udp</option>
</select>
<button class="btn btn-danger btn-xs form-control" ng-click="rmEntry(config.HostConfig.PortBindings, portBinding)">Remove</button> <button class="btn btn-danger btn-xs form-control" ng-click="rmEntry(config.HostConfig.PortBindings, portBinding)">Remove</button>
</div> </div>
</div> </div>