Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

feat(services): ability to publish ports using host mode (#838)

Browse source
This commit is contained in:
Glowbal 2017-05-04 09:43:20 +02:00 • committed by Anthony Lapenna
parent 43e1f25f89
commit df3a529f0a
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/components/createService/createServiceController.js
View file

@ -29,7 +29,7 @@ function ($scope, $state, Service, ServiceHelper, Volume, Network, ImageHelper,
}; };
$scope.addPortBinding = function() { $scope.addPortBinding = function() {
$scope.formValues.Ports.push({ PublishedPort: '', TargetPort: '', Protocol: 'tcp' }); $scope.formValues.Ports.push({ PublishedPort: '', TargetPort: '', Protocol: 'tcp', PublishMode: 'ingress' });
}; };
$scope.removePortBinding = function(index) { $scope.removePortBinding = function(index) {
@ -96,7 +96,8 @@ function ($scope, $state, Service, ServiceHelper, Volume, Network, ImageHelper,
var ports = []; var ports = [];
input.Ports.forEach(function (binding) { input.Ports.forEach(function (binding) {
var port = { var port = {
Protocol: binding.Protocol Protocol: binding.Protocol,
PublishMode: binding.PublishMode
}; };
if (binding.TargetPort) { if (binding.TargetPort) {
port.TargetPort = +binding.TargetPort; port.TargetPort = +binding.TargetPort;

10
app/components/createService/createservice.html
View file

@ -74,7 +74,7 @@
<div class="col-sm-12 form-inline" style="margin-top: 10px;"> <div class="col-sm-12 form-inline" style="margin-top: 10px;">
<div ng-repeat="portBinding in formValues.Ports" style="margin-top: 2px;"> <div ng-repeat="portBinding in formValues.Ports" style="margin-top: 2px;">
<!-- host-port --> <!-- host-port -->
<div class="input-group col-sm-4 input-group-sm"> <div class="input-group col-sm-3 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.PublishedPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)"> <input type="text" class="form-control" ng-model="portBinding.PublishedPort" placeholder="e.g. 80 or 1.2.3.4:80 (optional)">
</div> </div>
@ -83,17 +83,21 @@
<i class="fa fa-long-arrow-right" aria-hidden="true"></i> <i class="fa fa-long-arrow-right" aria-hidden="true"></i>
</span> </span>
<!-- container-port --> <!-- container-port -->
<div class="input-group col-sm-4 input-group-sm"> <div class="input-group col-sm-3 input-group-sm">
<span class="input-group-addon">container</span> <span class="input-group-addon">container</span>
<input type="text" class="form-control" ng-model="portBinding.TargetPort" placeholder="e.g. 80"> <input type="text" class="form-control" ng-model="portBinding.TargetPort" placeholder="e.g. 80">
</div> </div>
<!-- !container-port --> <!-- !container-port -->
<!-- protocol-actions --> <!-- protocol-actions -->
<div class="input-group col-sm-3 input-group-sm"> <div class="input-group col-sm-5 input-group-sm">
<div class="btn-group btn-group-sm"> <div class="btn-group btn-group-sm">
<label class="btn btn-primary" ng-model="portBinding.Protocol" uib-btn-radio="'tcp'">TCP</label> <label class="btn btn-primary" ng-model="portBinding.Protocol" uib-btn-radio="'tcp'">TCP</label>
<label class="btn btn-primary" ng-model="portBinding.Protocol" uib-btn-radio="'udp'">UDP</label> <label class="btn btn-primary" ng-model="portBinding.Protocol" uib-btn-radio="'udp'">UDP</label>
</div> </div>
<div class="btn-group btn-group-sm">
<label class="btn btn-primary" ng-model="portBinding.PublishMode" uib-btn-radio="'ingress'">Ingress</label>
<label class="btn btn-primary" ng-model="portBinding.PublishMode" uib-btn-radio="'host'">Host</label>
</div>
<button class="btn btn-sm btn-danger" type="button" ng-click="removePortBinding($index)"> <button class="btn btn-sm btn-danger" type="button" ng-click="removePortBinding($index)">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>
</button> </button>

9
app/components/service/includes/ports.html
View file

@ -17,6 +17,7 @@
<th>Host port</th> <th>Host port</th>
<th>Container port</th> <th>Container port</th>
<th>Protocol</th> <th>Protocol</th>
<th>Publish mode</th>
<th>Actions</th> <th>Actions</th>
</tr> </tr>
</thead> </thead>
@ -42,6 +43,14 @@
</select> </select>
</div> </div>
</td> </td>
<td>
<div class="input-group input-group-sm">
<select class="selectpicker form-control" ng-model="portBinding.PublishMode" ng-change="updatePublishedPort(service, mapping)" ng-disabled="isUpdating">
<option value="ingress">ingress</option>
<option value="host">host</option>
</select>
</div>
</td>
<td> <td>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-sm btn-danger" type="button" ng-click="removePortPublishedBinding(service, $index)" ng-disabled="isUpdating"> <button class="btn btn-sm btn-danger" type="button" ng-click="removePortPublishedBinding(service, $index)" ng-disabled="isUpdating">

2
app/components/service/serviceController.js
View file

@ -118,7 +118,7 @@ function ($scope, $stateParams, $state, $location, $anchorScroll, Service, Servi
if (!service.Ports) { if (!service.Ports) {
service.Ports = []; service.Ports = [];
} }
service.Ports.push({ PublishedPort: '', TargetPort: '', Protocol: 'tcp' }); service.Ports.push({ PublishedPort: '', TargetPort: '', Protocol: 'tcp', PublishMode: 'ingress' });
}; };
$scope.updatePublishedPort = function updatePublishedPort(service, portMapping) { $scope.updatePublishedPort = function updatePublishedPort(service, portMapping) {
updateServiceArray(service, 'Ports', service.Ports); updateServiceArray(service, 'Ports', service.Ports);