vvzvlad/portainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(podman): support add podman envs in the wizard [r8s-20] (#12056)

Browse Source
This commit is contained in:
Ali
2024-09-25 11:55:07 +12:00
committed by GitHub
parent db616bc8a5
commit 32e94d4e4e
108 changed files with 1921 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/docker/views/containers/edit/containerController.js
+6 -1
View File
@@ -6,6 +6,7 @@ import { FeatureId } from '@/react/portainer/feature-flags/enums';
import { ResourceControlType } from '@/react/portainer/access-control/types';
import { confirmContainerRecreation } from '@/react/docker/containers/ItemView/ConfirmRecreationModal';
import { commitContainer } from '@/react/docker/proxy/queries/useCommitContainerMutation';
import { ContainerEngine } from '@/react/portainer/environments/types';
angular.module('portainer.docker').controller('ContainerController', [
'$q',
@@ -123,7 +124,11 @@ angular.module('portainer.docker').controller('ContainerController', [
!allowHostNamespaceForRegularUsers ||
!allowPrivilegedModeForRegularUsers;
$scope.displayRecreateButton = !inSwarm && !autoRemove && (admin || !settingRestrictsRegularUsers);
// displayRecreateButton should false for podman because recreating podman containers give and error: cannot set memory swappiness with cgroupv2
// https://github.com/containrrr/watchtower/issues/1060#issuecomment-2319076222
const isPodman = endpoint.ContainerEngine === ContainerEngine.Podman;
$scope.displayDuplicateEditButton = !inSwarm && !autoRemove && (admin || !settingRestrictsRegularUsers);
$scope.displayRecreateButton = !inSwarm && !autoRemove && (admin || !settingRestrictsRegularUsers) && !isPodman;
$scope.displayCreateWebhookButton = $scope.displayRecreateButton;
})
.catch(function error(err) {