diff --git a/app/react/edge/components/EdgeScriptForm/__snapshots__/scripts.test.ts.snap b/app/react/edge/components/EdgeScriptForm/__snapshots__/scripts.test.ts.snap index 5388a79c0..55e0d6390 100644 --- a/app/react/edge/components/EdgeScriptForm/__snapshots__/scripts.test.ts.snap +++ b/app/react/edge/components/EdgeScriptForm/__snapshots__/scripts.test.ts.snap @@ -41,6 +41,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " @@ -61,6 +62,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ -e EDGE_GROUPS=1:2 \\ -e PORTAINER_GROUP=5 \\ -e PORTAINER_TAGS=10:20 \\ @@ -85,6 +87,7 @@ sudo podman run -d \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ -e EDGE_ASYNC=1 \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " @@ -105,6 +108,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ -e MY_VAR=value1 \\ -e ANOTHER_VAR=value2 \\ --name portainer_edge_agent \\ @@ -129,6 +133,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " @@ -149,6 +154,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ -e EDGE_GROUPS=1:2:3 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 @@ -169,6 +175,7 @@ sudo podman run -d \\ -e EDGE_ID=test-edge-id \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " @@ -189,6 +196,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ -e PORTAINER_GROUP=5 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 @@ -210,6 +218,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=1 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " @@ -230,6 +239,7 @@ sudo podman run -d \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ -e AGENT_SECRET=test-secret \\ + -e PODMAN=1 \\ -e PORTAINER_TAGS=10:20:30 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 @@ -250,6 +260,7 @@ sudo podman run -d \\ -e EDGE_ID=test-edge-id \\ -e EDGE_KEY=test-edge-key \\ -e EDGE_INSECURE_POLL=0 \\ + -e PODMAN=1 \\ --name portainer_edge_agent \\ docker.io/portainer/agent:2.19.0 " diff --git a/app/react/edge/components/EdgeScriptForm/scripts.test.ts b/app/react/edge/components/EdgeScriptForm/scripts.test.ts index 8412d6c01..cd40c078d 100644 --- a/app/react/edge/components/EdgeScriptForm/scripts.test.ts +++ b/app/react/edge/components/EdgeScriptForm/scripts.test.ts @@ -8,6 +8,30 @@ import { } from './scripts'; import { ScriptFormValues } from './types'; +it('buildLinuxPodmanCommand should include PODMAN=1', () => { + const command = buildLinuxPodmanCommand( + '2.19.0', + 'test-edge-key', + { + allowSelfSignedCertificates: false, + authEnabled: false, + edgeGroupsIds: [], + edgeIdGenerator: '', + envVars: '', + group: 0, + os: 'linux', + platform: 'podman', + tagsIds: [], + tlsEnabled: false, + }, + false, + 'test-edge-id', + 'test-secret' + ); + + expect(command).toContain('PODMAN=1'); +}); + describe.each([ { name: 'buildLinuxStandaloneCommand', diff --git a/app/react/edge/components/EdgeScriptForm/scripts.ts b/app/react/edge/components/EdgeScriptForm/scripts.ts index af2a4a32e..a1d85910e 100644 --- a/app/react/edge/components/EdgeScriptForm/scripts.ts +++ b/app/react/edge/components/EdgeScriptForm/scripts.ts @@ -106,6 +106,7 @@ export function buildLinuxPodmanCommand( agentSecret, useAsyncMode ), + 'PODMAN=1', ...metaEnvVars(properties), ]); diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardPodman/AgentTab/DeploymentScripts.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardPodman/AgentTab/DeploymentScripts.tsx index 31ca3fe7d..9c6868632 100644 --- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardPodman/AgentTab/DeploymentScripts.tsx +++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardPodman/AgentTab/DeploymentScripts.tsx @@ -75,6 +75,7 @@ function linuxPodmanCommandRootful(agentVersion: string, agentSecret: string) { sudo podman volume create portainer\n sudo podman run -d \\ -p 9001:9001 ${secret}\\ +-e PODMAN=1 \\ --name portainer_agent \\ --restart=always \\ --privileged \\