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

fix(container-creation): set a default runtime value (#2325) 

* fix(containers): creating a container with default runtime let the docker daemon assume the correct value

* refactor(containers): implementation simplification of default runtime value
pull/2360/head
baron_l 2018-10-08 22:28:26 +02:00 committed by Anthony Lapenna
parent ca08b2fa2a
commit e948d606f4
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,14 +544,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
SystemService.info() SystemService.info()
.then(function success(data) { .then(function success(data) {
var runtimes = data.Runtimes; $scope.availableRuntimes = Object.keys(data.Runtimes);
$scope.availableRuntimes = runtimes; $scope.config.HostConfig.Runtime = '';
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; $scope.state.sliderMaxCpu = 32;
if (data.NCPU) { if (data.NCPU) {
$scope.state.sliderMaxCpu = data.NCPU; $scope.state.sliderMaxCpu = data.NCPU;

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

@ -503,11 +503,11 @@
<!-- !privileged-mode --> <!-- !privileged-mode -->
<!-- runtimes --> <!-- runtimes -->
<div class="form-group"> <div class="form-group">
<label for="container_runtime" class="col-sm-2 col-lg-1 control-label text-left">Runtime</label> <label for="container_runtime" class="col-sm-1 control-label text-left">Runtime</label>
<div class="col-sm-1"> <div class="col-sm-11">
<select class="form-control" ng-model="config.HostConfig.Runtime" id="container_runtime"> <select class="form-control" ng-model="config.HostConfig.Runtime"
<option selected disabled hidden value="">Select a runtime</option> id="container_runtime" ng-options="runtime for runtime in availableRuntimes">
<option ng-repeat="(runtime, _) in availableRuntimes" ng-value="runtime">{{ runtime }}</option> <option selected value="">Default</option>
</select> </select>
</div> </div>
</div> </div>