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

feat(container-creation): add runtime option in (#2162) (#2163)

pull/2193/head
Ru Fan 2018-08-16 17:28:06 +08:00 committed by Anthony Lapenna
parent 55f719128b
commit de9f99d030
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/docker/views/containers/create/createContainerController.js
View File

@ -48,6 +48,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
Binds: [],
NetworkMode: 'bridge',
Privileged: false,
Runtime: '',
ExtraHosts: [],
Devices: [],
CapAdd: [],
@ -581,6 +582,14 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
SystemService.info()
.then(function success(data) {
var runtimes = data.Runtimes;
$scope.availableRuntimes = runtimes;
if ('runc' in runtimes) {
$scope.config.HostConfig.Runtime = 'runc';
}
else if (Object.keys(runtimes).length !== 0) {
$scope.config.HostConfig.Runtime = Object.keys(runtimes)[0];
}
$scope.state.sliderMaxCpu = 32;
if (data.NCPU) {
$scope.state.sliderMaxCpu = data.NCPU;

11
app/docker/views/containers/create/createcontainer.html
View File

@ -500,6 +500,17 @@
</div>
</div>
<!-- !privileged-mode -->
<!-- runtimes -->
<div class="form-group">
<label for="container_runtime" class="col-sm-2 col-lg-1 control-label text-left">Runtime</label>
<div class="col-sm-1">
<select class="form-control" ng-model="config.HostConfig.Runtime" id="container_runtime">
<option selected disabled hidden value="">Select a runtime</option>
<option ng-repeat="(runtime, _) in availableRuntimes" ng-value="runtime">{{ runtime }}</option>
</select>
</div>
</div>
<!-- !runtimes -->
</form>
<form class="form-horizontal" style="margin-top: 15px;">
<!-- devices -->