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

fix(docker/container): use nodeName to build links to networks used by containers (#12002)
Some checks failed
/ triage (push) Has been cancelled
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
ci / build_images (map[arch:s390x platform:linux version:]) (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:
LP B 2024-07-17 14:40:05 +02:00 • committed by GitHub
parent a62aac296b
commit 1900fb695d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 134 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/react/docker/networks/queries/useDisconnectContainerMutation.ts
View file

@ -9,6 +9,7 @@ import {
} from '@/react-tools/react-query';
import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl';
import { withAgentTargetHeader } from '../../proxy/queries/utils';
import { ContainerId } from '../../containers/types';
import { NetworkId } from '../types';
@ -24,8 +25,13 @@ export function useDisconnectContainer({
const client = useQueryClient();
return useMutation(
({ containerId }: { containerId: ContainerId }) =>
disconnectContainer(environmentId, networkId, containerId),
({
containerId,
nodeName,
}: {
containerId: ContainerId;
nodeName?: string;
}) => disconnectContainer(environmentId, networkId, containerId, nodeName),
mutationOptions(
withInvalidate(client, [queryKeys.item(environmentId, networkId)]),
withError('Unable to disconnect container from network')
@ -43,7 +49,8 @@ export function useDisconnectContainer({
export async function disconnectContainer(
environmentId: EnvironmentId,
networkId: NetworkId,
containerId: ContainerId
containerId: ContainerId,
nodeName?: string
) {
try {
await axios.post(
@ -51,7 +58,8 @@ export async function disconnectContainer(
{
Container: containerId,
Force: false,
}
},
{ headers: { ...withAgentTargetHeader(nodeName) } }
);
return { networkId, environmentId };
} catch (err) {