1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 14:55:27 +02:00

feat(podman): support add podman envs in the wizard [r8s-20] (#12056)
Some checks failed
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
ci / build_images (map[arch:arm platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Has been cancelled
/ triage (push) Has been cancelled
Lint / Run linters (push) Has been cancelled
Test / test-client (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:linux]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
Test / test-server (map[arch:arm64 platform:linux]) (push) Has been cancelled
ci / build_manifests (push) Has been cancelled

This commit is contained in:
Ali 2024-09-25 11:55:07 +12:00 committed by GitHub
parent db616bc8a5
commit 32e94d4e4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
108 changed files with 1921 additions and 272 deletions

View file

@ -43,11 +43,12 @@
Remove</button
>
</div>
<div class="btn-group" role="group" aria-label="..." ng-if="displayRecreateButton" authorization="DockerContainerCreate">
<div class="btn-group" role="group" aria-label="..." ng-if="displayRecreateButton || displayDuplicateEditButton" authorization="DockerContainerCreate">
<button
type="button"
class="btn btn-light btn-sm"
ng-disabled="state.recreateContainerInProgress || container.IsPortainer"
ng-if="displayRecreateButton"
ng-click="recreate()"
button-spinner="state.recreateContainerInProgress"
>
@ -57,7 +58,13 @@
>
<span ng-show="state.recreateContainerInProgress">Recreation in progress...</span>
</button>
<a class="btn btn-light btn-sm" type="button" ui-sref="docker.containers.new({ from: container.Id, nodeName: nodeName })" ng-disabled="container.IsPortainer">
<a
class="btn btn-light btn-sm"
type="button"
ui-sref="docker.containers.new({ from: container.Id, nodeName: nodeName })"
ng-disabled="container.IsPortainer"
ng-if="displayDuplicateEditButton"
>
<pr-icon icon="'copy'"></pr-icon>
Duplicate/Edit</a
>
@ -218,7 +225,7 @@
<div class="col-sm-12">
<button
type="button"
class="btn btn-primary btn-sm"
class="btn btn-primary btn-sm !ml-0"
ng-disabled="!state.pullImageValidity || !config.RegistryModel.Image || config.commitInProgress"
ng-click="commit()"
>

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) {

View file

@ -97,11 +97,9 @@ angular.module('portainer.docker').controller('ContainerStatsController', [
function startChartUpdate(networkChart, cpuChart, memoryChart, ioChart) {
$q.all({
stats: ContainerService.containerStats(endpoint.Id, $transition$.params().id),
top: ContainerService.containerTop(endpoint.Id, $transition$.params().id),
})
.then(function success(data) {
var stats = data.stats;
$scope.processInfo = data.top;
if (stats.Networks.length === 0) {
$scope.state.networkStatsUnavailable = true;
}
@ -125,11 +123,9 @@ angular.module('portainer.docker').controller('ContainerStatsController', [
$scope.repeater = $interval(function () {
$q.all({
stats: ContainerService.containerStats(endpoint.Id, $transition$.params().id),
top: ContainerService.containerTop(endpoint.Id, $transition$.params().id),
})
.then(function success(data) {
var stats = data.stats;
$scope.processInfo = data.top;
updateNetworkChart(stats, networkChart);
updateMemoryChart(stats, memoryChart);
updateCPUChart(stats, cpuChart);

View file

@ -108,4 +108,4 @@
</div>
</div>
<docker-container-processes-datatable dataset="processInfo.Processes" headers="processInfo.Titles"></docker-container-processes-datatable>
<docker-container-processes-datatable></docker-container-processes-datatable>