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

fix(docker/containers): show sysctl control (#5051)

pull/5080/head
Chaim Lev-Ari 2021-05-12 03:29:35 +03:00 committed by GitHub
parent 3641158daf
commit a21798f518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/portainer.go
View File

@ -336,7 +336,7 @@ type (
// Whether non-administrator should be able to use container capabilities // Whether non-administrator should be able to use container capabilities
AllowContainerCapabilitiesForRegularUsers bool `json:"allowContainerCapabilitiesForRegularUsers" example:"true"` AllowContainerCapabilitiesForRegularUsers bool `json:"allowContainerCapabilitiesForRegularUsers" example:"true"`
// Whether non-administrator should be able to use sysctl settings // Whether non-administrator should be able to use sysctl settings
AllowSysctlSettingForRegularUsers bool `json:"AllowSysctlSettingForRegularUsers" example:"true"` AllowSysctlSettingForRegularUsers bool `json:"allowSysctlSettingForRegularUsers" example:"true"`
// Whether host management features are enabled // Whether host management features are enabled
EnableHostManagementFeatures bool `json:"enableHostManagementFeatures" example:"true"` EnableHostManagementFeatures bool `json:"enableHostManagementFeatures" example:"true"`
} }

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

@ -972,9 +972,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
} }
async function shouldShowSysctls() { async function shouldShowSysctls() {
const { allowSysctlSettingForRegularUsers } = $scope.applicationState.application; return endpoint.SecuritySettings.allowSysctlSettingForRegularUsers || Authentication.isAdmin();
return allowSysctlSettingForRegularUsers || Authentication.isAdmin();
} }
async function checkIfContainerCapabilitiesEnabled() { async function checkIfContainerCapabilitiesEnabled() {