Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-20 13:59:40 +02:00
Code Issues Releases Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

27
app/react/docker/containers/CreateView/NetworkTab/toViewModel.ts
View file

@ -5,8 +5,8 @@ import { ContainerListViewModel } from '../../types';
import { CONTAINER_MODE, Values } from './types';
export function getDefaultViewModel(isWindows: boolean) {
const networkMode = isWindows ? 'nat' : 'bridge';
export function getDefaultViewModel(isWindows: boolean, isPodman?: boolean) {
const networkMode = getDefaultNetworkMode(isWindows, isPodman);
return {
networkMode,
hostname: '',
@ -21,10 +21,17 @@ export function getDefaultViewModel(isWindows: boolean) {
};
}
export function getDefaultNetworkMode(isWindows: boolean, isPodman?: boolean) {
if (isWindows) return 'nat';
if (isPodman) return 'podman';
return 'bridge';
}
export function toViewModel(
config: ContainerDetailsJSON,
networks: Array<DockerNetwork>,
runningContainers: Array<ContainerListViewModel> = []
runningContainers: Array<ContainerListViewModel> = [],
isPodman?: boolean
): Values {
const dns = config.HostConfig?.Dns;
const [primaryDns = '', secondaryDns = ''] = dns || [];
@ -34,7 +41,8 @@ export function toViewModel(
const [networkMode, container = ''] = getNetworkMode(
config,
networks,
runningContainers
runningContainers,
isPodman
);
const networkSettings = config.NetworkSettings?.Networks?.[networkMode];
@ -61,10 +69,11 @@ export function toViewModel(
};
}
function getNetworkMode(
export function getNetworkMode(
config: ContainerDetailsJSON,
networks: Array<DockerNetwork>,
runningContainers: Array<ContainerListViewModel> = []
runningContainers: Array<ContainerListViewModel> = [],
isPodman?: boolean
) {
let networkMode = config.HostConfig?.NetworkMode || '';
if (!networkMode) {
@ -85,6 +94,9 @@ function getNetworkMode(
const networkNames = networks.map((n) => n.Name);
if (networkNames.includes(networkMode)) {
if (isPodman && networkMode === 'bridge') {
return ['podman'] as const;
}
return [networkMode] as const;
}
@ -92,6 +104,9 @@ function getNetworkMode(
networkNames.includes('bridge') &&
(!networkMode || networkMode === 'default' || networkMode === 'bridge')
) {
if (isPodman) {
return ['podman'] as const;
}
return ['bridge'] as const;
}