mirror of https://github.com/portainer/portainer
fix(container): replace container using correct node name EE-7066 (#11847)
parent
d283c63a33
commit
d7b412eccc
|
@ -161,7 +161,7 @@ async function replace({
|
|||
);
|
||||
|
||||
await removeContainer(environment.Id, oldContainer.Id, {
|
||||
nodeName: values.nodeName,
|
||||
nodeName: oldContainer.NodeName,
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -178,13 +178,17 @@ async function renameAndCreate(
|
|||
) {
|
||||
let renamed = false;
|
||||
try {
|
||||
await stopContainerIfNeeded(environmentId, oldContainer, nodeName);
|
||||
await stopContainerIfNeeded(
|
||||
environmentId,
|
||||
oldContainer,
|
||||
oldContainer.NodeName
|
||||
);
|
||||
|
||||
await renameContainer(
|
||||
environmentId,
|
||||
oldContainer.Id,
|
||||
`${oldContainer.Names[0]}-old`,
|
||||
{ nodeName }
|
||||
{ nodeName: oldContainer.NodeName }
|
||||
);
|
||||
renamed = true;
|
||||
|
||||
|
@ -192,7 +196,7 @@ async function renameAndCreate(
|
|||
} catch (e) {
|
||||
if (renamed) {
|
||||
await renameContainer(environmentId, oldContainer.Id, name, {
|
||||
nodeName,
|
||||
nodeName: oldContainer.NodeName,
|
||||
});
|
||||
}
|
||||
throw e;
|
||||
|
|
|
@ -10,7 +10,10 @@ import {
|
|||
import { RawAxiosRequestHeaders } from 'axios';
|
||||
|
||||
import { PortainerResponse } from '@/react/docker/types';
|
||||
import axios, { parseAxiosError } from '@/portainer/services/axios';
|
||||
import axios, {
|
||||
agentTargetHeader,
|
||||
parseAxiosError,
|
||||
} from '@/portainer/services/axios';
|
||||
import { ContainerId } from '@/react/docker/containers/types';
|
||||
import { EnvironmentId } from '@/react/portainer/environments/types';
|
||||
import { queryClient } from '@/react-tools/react-query';
|
||||
|
@ -115,7 +118,7 @@ async function getContainer(
|
|||
const headers: RawAxiosRequestHeaders = {};
|
||||
|
||||
if (nodeName) {
|
||||
headers['X-PortainerAgent-Target'] = nodeName;
|
||||
headers[agentTargetHeader] = nodeName;
|
||||
}
|
||||
|
||||
const { data } = await axios.get<ContainerResponse>(
|
||||
|
|
Loading…
Reference in New Issue