diff --git a/api/http/proxy/factory/docker/transport.go b/api/http/proxy/factory/docker/transport.go index d25610f1c..fd543c339 100644 --- a/api/http/proxy/factory/docker/transport.go +++ b/api/http/proxy/factory/docker/transport.go @@ -111,7 +111,7 @@ var prefixProxyFuncMap = map[string]func(*Transport, *http.Request, string) (*ht // ProxyDockerRequest intercepts a Docker API request and apply logic based // on the requested operation. func (transport *Transport) ProxyDockerRequest(request *http.Request) (*http.Response, error) { - // from : /v1.41/containers/{id}/json + // from : /v1.44/containers/{id}/json // or : /containers/{id}/json // to : /containers/{id}/json unversionedPath := apiVersionRe.ReplaceAllString(request.URL.Path, "") diff --git a/app/docker/filters/utils.ts b/app/docker/filters/utils.ts index a5b409d0f..e812b9d83 100644 --- a/app/docker/filters/utils.ts +++ b/app/docker/filters/utils.ts @@ -1,4 +1,4 @@ -import { NodeStatus, TaskState } from 'docker-types/generated/1.41'; +import { NodeStatus, TaskState } from 'docker-types/generated/1.44'; import _ from 'lodash'; export function trimVersionTag(fullName: string) { diff --git a/app/docker/models/config.ts b/app/docker/models/config.ts index 5513766c7..32ceb9c19 100644 --- a/app/docker/models/config.ts +++ b/app/docker/models/config.ts @@ -1,4 +1,4 @@ -import { Config } from 'docker-types/generated/1.41'; +import { Config } from 'docker-types/generated/1.44'; import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; import { PortainerResponse } from '@/react/docker/types'; diff --git a/app/docker/models/image.ts b/app/docker/models/image.ts index f3f777bb2..862352742 100644 --- a/app/docker/models/image.ts +++ b/app/docker/models/image.ts @@ -1,4 +1,4 @@ -import { ImageSummary } from 'docker-types/generated/1.41'; +import { ImageSummary } from 'docker-types/generated/1.44'; import { PortainerResponse } from '@/react/docker/types'; diff --git a/app/docker/models/imageDetails.ts b/app/docker/models/imageDetails.ts index 8cea5d826..5a7f1876d 100644 --- a/app/docker/models/imageDetails.ts +++ b/app/docker/models/imageDetails.ts @@ -1,4 +1,4 @@ -import { ImageInspect } from 'docker-types/generated/1.41'; +import { ImageInspect } from 'docker-types/generated/1.44'; type ImageInspectConfig = NonNullable; diff --git a/app/docker/models/network.ts b/app/docker/models/network.ts index d5f85112f..b17c16b74 100644 --- a/app/docker/models/network.ts +++ b/app/docker/models/network.ts @@ -1,4 +1,4 @@ -import { IPAM, Network, NetworkContainer } from 'docker-types/generated/1.41'; +import { IPAM, Network, NetworkContainer } from 'docker-types/generated/1.44'; import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; diff --git a/app/docker/models/node.ts b/app/docker/models/node.ts index df53961bd..60a1b4535 100644 --- a/app/docker/models/node.ts +++ b/app/docker/models/node.ts @@ -8,7 +8,7 @@ import { ObjectVersion, Platform, ResourceObject, -} from 'docker-types/generated/1.41'; +} from 'docker-types/generated/1.44'; export class NodeViewModel { Model: Node; diff --git a/app/docker/models/secret.ts b/app/docker/models/secret.ts index 867b3141c..d7e78100e 100644 --- a/app/docker/models/secret.ts +++ b/app/docker/models/secret.ts @@ -1,4 +1,4 @@ -import { Secret } from 'docker-types/generated/1.41'; +import { Secret } from 'docker-types/generated/1.44'; import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { PortainerResponse } from '@/react/docker/types'; diff --git a/app/docker/models/service.ts b/app/docker/models/service.ts index 1faebf869..1d5cb8e69 100644 --- a/app/docker/models/service.ts +++ b/app/docker/models/service.ts @@ -6,7 +6,7 @@ import { Service, ServiceSpec, TaskSpec, -} from 'docker-types/generated/1.41'; +} from 'docker-types/generated/1.44'; import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { PortainerResponse } from '@/react/docker/types'; diff --git a/app/docker/models/task.ts b/app/docker/models/task.ts index fb849d6d6..aff4cfd4c 100644 --- a/app/docker/models/task.ts +++ b/app/docker/models/task.ts @@ -1,4 +1,4 @@ -import { Task } from 'docker-types/generated/1.41'; +import { Task } from 'docker-types/generated/1.44'; import { DeepPick } from '@/types/deepPick'; diff --git a/app/docker/models/volume.ts b/app/docker/models/volume.ts index 827f09287..7fc34312e 100644 --- a/app/docker/models/volume.ts +++ b/app/docker/models/volume.ts @@ -1,4 +1,4 @@ -import { Volume } from 'docker-types/generated/1.41'; +import { Volume } from 'docker-types/generated/1.44'; import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel'; import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn'; diff --git a/app/portainer/services/dockerMaxApiVersion.ts b/app/portainer/services/dockerMaxApiVersion.ts index c1c701671..520e25910 100644 --- a/app/portainer/services/dockerMaxApiVersion.ts +++ b/app/portainer/services/dockerMaxApiVersion.ts @@ -4,8 +4,4 @@ export const MaxDockerAPIVersionKey = 'maxDockerAPIVersion' as const; export type DockerAPIVersionType = number; // this is the version we are using with the generated API types -export const MAX_DOCKER_API_VERSION: DockerAPIVersionType = 1.41; - -// https://docs.docker.com/engine/api/#api-version-matrix -// Docker 26 = API 1.45 -export const LATEST_DOCKER_API_VERSION: DockerAPIVersionType = 1.45; +export const MAX_DOCKER_API_VERSION: DockerAPIVersionType = 1.44; diff --git a/app/portainer/services/dockerMaxApiVersionInterceptor.ts b/app/portainer/services/dockerMaxApiVersionInterceptor.ts index f35f16e36..9a66aaedf 100644 --- a/app/portainer/services/dockerMaxApiVersionInterceptor.ts +++ b/app/portainer/services/dockerMaxApiVersionInterceptor.ts @@ -1,4 +1,4 @@ -import { SystemVersion } from 'docker-types/generated/1.41'; +import { SystemVersion } from 'docker-types/generated/1.44'; import Axios, { InternalAxiosRequestConfig } from 'axios'; import { setupCache, buildMemoryStorage } from 'axios-cache-interceptor'; diff --git a/app/react/docker/configs/queries/useConfig.ts b/app/react/docker/configs/queries/useConfig.ts index fc80798de..d93791817 100644 --- a/app/react/docker/configs/queries/useConfig.ts +++ b/app/react/docker/configs/queries/useConfig.ts @@ -1,4 +1,4 @@ -import { Config } from 'docker-types/generated/1.41'; +import { Config } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/configs/queries/useConfigs.ts b/app/react/docker/configs/queries/useConfigs.ts index d026cb761..1f62f8464 100644 --- a/app/react/docker/configs/queries/useConfigs.ts +++ b/app/react/docker/configs/queries/useConfigs.ts @@ -1,4 +1,4 @@ -import { Config } from 'docker-types/generated/1.41'; +import { Config } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/configs/queries/useCreateConfigMutation.ts b/app/react/docker/configs/queries/useCreateConfigMutation.ts index 329ae8af3..a726c5b29 100644 --- a/app/react/docker/configs/queries/useCreateConfigMutation.ts +++ b/app/react/docker/configs/queries/useCreateConfigMutation.ts @@ -1,4 +1,4 @@ -import { ConfigSpec } from 'docker-types/generated/1.41'; +import { ConfigSpec } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.requestModel.ts b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.requestModel.ts index 3c540689c..8a124964e 100644 --- a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.requestModel.ts +++ b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.requestModel.ts @@ -1,4 +1,4 @@ -import { PortMap } from 'docker-types/generated/1.41'; +import { PortMap } from 'docker-types/generated/1.44'; import _ from 'lodash'; import { PortMapping, Protocol, Values } from './PortsMappingField'; diff --git a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.viewModel.ts b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.viewModel.ts index 16f5b4363..1e4444a83 100644 --- a/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.viewModel.ts +++ b/app/react/docker/containers/CreateView/BaseForm/PortsMappingField.viewModel.ts @@ -1,4 +1,4 @@ -import { PortMap } from 'docker-types/generated/1.41'; +import { PortMap } from 'docker-types/generated/1.44'; import _ from 'lodash'; import { Protocol, Values } from './PortsMappingField'; diff --git a/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx b/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx index 983e2ad40..bdc74f91a 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/ConsoleSettings.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import { mixed } from 'yup'; -import { ContainerConfig } from 'docker-types/generated/1.41'; +import { ContainerConfig } from 'docker-types/generated/1.44'; import { AutomationTestingProps } from '@/types'; diff --git a/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx b/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx index be8017ced..b7df4d904 100644 --- a/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx +++ b/app/react/docker/containers/CreateView/CommandsTab/toViewModel.tsx @@ -1,4 +1,4 @@ -import { HostConfig } from 'docker-types/generated/1.41'; +import { HostConfig } from 'docker-types/generated/1.44'; import { commandArrayToString } from '@/docker/helpers/containers'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx b/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx index d76ce0186..68ddef265 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx +++ b/app/react/docker/containers/CreateView/ResourcesTab/DevicesField.tsx @@ -1,6 +1,6 @@ import { FormikErrors } from 'formik'; import { array, object, SchemaOf, string } from 'yup'; -import { DeviceMapping } from 'docker-types/generated/1.41'; +import { DeviceMapping } from 'docker-types/generated/1.44'; import { FormError } from '@@/form-components/FormError'; import { InputList, ItemProps } from '@@/form-components/InputList'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toRequest.ts b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toRequest.ts index 5ae31d9fb..a713c659b 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toRequest.ts +++ b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toRequest.ts @@ -1,4 +1,4 @@ -import { DeviceRequest } from 'docker-types/generated/1.41'; +import { DeviceRequest } from 'docker-types/generated/1.44'; import { Values } from './types'; diff --git a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toViewModel.ts b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toViewModel.ts index 5cb923c0a..79105943b 100644 --- a/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toViewModel.ts +++ b/app/react/docker/containers/CreateView/ResourcesTab/GpuFieldset/toViewModel.ts @@ -1,4 +1,4 @@ -import { DeviceRequest } from 'docker-types/generated/1.41'; +import { DeviceRequest } from 'docker-types/generated/1.44'; import { Values } from './types'; diff --git a/app/react/docker/containers/CreateView/types.ts b/app/react/docker/containers/CreateView/types.ts index 14a8b3609..89c966493 100644 --- a/app/react/docker/containers/CreateView/types.ts +++ b/app/react/docker/containers/CreateView/types.ts @@ -2,7 +2,7 @@ import { ContainerConfig, HostConfig, NetworkingConfig, -} from 'docker-types/generated/1.41'; +} from 'docker-types/generated/1.44'; export interface CreateContainerRequest extends ContainerConfig { HostConfig: HostConfig; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx index 8612a09d0..d73d0c44f 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/ContainerNetworksDatatable.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react'; import { Network } from 'lucide-react'; -import { EndpointSettings, NetworkSettings } from 'docker-types/generated/1.41'; +import { EndpointSettings, NetworkSettings } from 'docker-types/generated/1.44'; import { createPersistedStore } from '@@/datatables/types'; import { useTableState } from '@@/datatables/useTableState'; diff --git a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/types.ts b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/types.ts index 7775b0216..4efde17d5 100644 --- a/app/react/docker/containers/ItemView/ContainerNetworksDatatable/types.ts +++ b/app/react/docker/containers/ItemView/ContainerNetworksDatatable/types.ts @@ -1,5 +1,5 @@ import { TableMeta } from '@tanstack/react-table'; -import { EndpointSettings } from 'docker-types/generated/1.41'; +import { EndpointSettings } from 'docker-types/generated/1.44'; export type TableNetwork = EndpointSettings & { id: string; name: string }; diff --git a/app/react/docker/containers/queries/useContainer.ts b/app/react/docker/containers/queries/useContainer.ts index f7befedd0..a28ef821d 100644 --- a/app/react/docker/containers/queries/useContainer.ts +++ b/app/react/docker/containers/queries/useContainer.ts @@ -6,7 +6,7 @@ import { HostConfig, MountPoint, NetworkSettings, -} from 'docker-types/generated/1.41'; +} from 'docker-types/generated/1.44'; import { PortainerResponse } from '@/react/docker/types'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/containers/queries/useUpdateContainer.ts b/app/react/docker/containers/queries/useUpdateContainer.ts index fe2fb9ed0..a58d2ac8f 100644 --- a/app/react/docker/containers/queries/useUpdateContainer.ts +++ b/app/react/docker/containers/queries/useUpdateContainer.ts @@ -1,4 +1,4 @@ -import { Resources, RestartPolicy } from 'docker-types/generated/1.41'; +import { Resources, RestartPolicy } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/containers/types/response.ts b/app/react/docker/containers/types/response.ts index aeb39e65d..673e31689 100644 --- a/app/react/docker/containers/types/response.ts +++ b/app/react/docker/containers/types/response.ts @@ -1,4 +1,4 @@ -import { ContainerSummary } from 'docker-types/generated/1.41'; +import { ContainerSummary } from 'docker-types/generated/1.44'; import { PortainerResponse } from '@/react/docker/types'; import { WithRequiredProperties } from '@/types'; diff --git a/app/react/docker/events/EventsDatatables.tsx b/app/react/docker/events/EventsDatatables.tsx index 36d356fd1..220bdf516 100644 --- a/app/react/docker/events/EventsDatatables.tsx +++ b/app/react/docker/events/EventsDatatables.tsx @@ -1,6 +1,6 @@ import { createColumnHelper } from '@tanstack/react-table'; import { Clock } from 'lucide-react'; -import { EventMessage } from 'docker-types/generated/1.41'; +import { EventMessage } from 'docker-types/generated/1.44'; import { isoDateFromTimestamp } from '@/portainer/filters/filters'; diff --git a/app/react/docker/events/model.ts b/app/react/docker/events/model.ts index 437ed3ebb..cc3801e40 100644 --- a/app/react/docker/events/model.ts +++ b/app/react/docker/events/model.ts @@ -1,4 +1,4 @@ -import { EventMessage } from 'docker-types/generated/1.41'; +import { EventMessage } from 'docker-types/generated/1.44'; type EventType = NonNullable; type Action = string; diff --git a/app/react/docker/networks/ListView/types.ts b/app/react/docker/networks/ListView/types.ts index 56cad2570..38bff9c9c 100644 --- a/app/react/docker/networks/ListView/types.ts +++ b/app/react/docker/networks/ListView/types.ts @@ -1,4 +1,4 @@ -import { IPAMConfig } from 'docker-types/generated/1.41'; +import { IPAMConfig } from 'docker-types/generated/1.44'; import { NetworkViewModel } from '@/docker/models/network'; diff --git a/app/react/docker/networks/queries/useConnectContainerMutation.ts b/app/react/docker/networks/queries/useConnectContainerMutation.ts index 9ffab587e..8b387f080 100644 --- a/app/react/docker/networks/queries/useConnectContainerMutation.ts +++ b/app/react/docker/networks/queries/useConnectContainerMutation.ts @@ -1,4 +1,4 @@ -import { EndpointSettings } from 'docker-types/generated/1.41'; +import { EndpointSettings } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/networks/queries/useCreateNetworkMutation.ts b/app/react/docker/networks/queries/useCreateNetworkMutation.ts index 011d17fc3..4fa33aa53 100644 --- a/app/react/docker/networks/queries/useCreateNetworkMutation.ts +++ b/app/react/docker/networks/queries/useCreateNetworkMutation.ts @@ -1,4 +1,4 @@ -import { Network } from 'docker-types/generated/1.41'; +import { Network } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/images/useImage.ts b/app/react/docker/proxy/queries/images/useImage.ts index 23c012f19..777783164 100644 --- a/app/react/docker/proxy/queries/images/useImage.ts +++ b/app/react/docker/proxy/queries/images/useImage.ts @@ -1,4 +1,4 @@ -import { ImageInspect } from 'docker-types/generated/1.41'; +import { ImageInspect } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/images/useImages.ts b/app/react/docker/proxy/queries/images/useImages.ts index 952412e05..c9283263d 100644 --- a/app/react/docker/proxy/queries/images/useImages.ts +++ b/app/react/docker/proxy/queries/images/useImages.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { ImageSummary } from 'docker-types/generated/1.41'; +import { ImageSummary } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/nodes/useNode.ts b/app/react/docker/proxy/queries/nodes/useNode.ts index 670d1d495..0046369aa 100644 --- a/app/react/docker/proxy/queries/nodes/useNode.ts +++ b/app/react/docker/proxy/queries/nodes/useNode.ts @@ -1,4 +1,4 @@ -import { Node } from 'docker-types/generated/1.41'; +import { Node } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/nodes/useNodes.ts b/app/react/docker/proxy/queries/nodes/useNodes.ts index 44b86fc37..ed2ae9990 100644 --- a/app/react/docker/proxy/queries/nodes/useNodes.ts +++ b/app/react/docker/proxy/queries/nodes/useNodes.ts @@ -1,4 +1,4 @@ -import { Node } from 'docker-types/generated/1.41'; +import { Node } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts index 069ae4a3b..b42504d44 100644 --- a/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts +++ b/app/react/docker/proxy/queries/nodes/useUpdateNodeMutation.ts @@ -1,4 +1,4 @@ -import { Node, NodeSpec } from 'docker-types/generated/1.41'; +import { Node, NodeSpec } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts index aae93fd45..ea2ca7894 100644 --- a/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useCreateSecretMutation.ts @@ -1,4 +1,4 @@ -import { SecretSpec } from 'docker-types/generated/1.41'; +import { SecretSpec } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts index 6d71f2685..4cd5d8b66 100644 --- a/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts +++ b/app/react/docker/proxy/queries/secrets/useRemoveSecretMutation.ts @@ -1,4 +1,4 @@ -import { Secret } from 'docker-types/generated/1.41'; +import { Secret } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/secrets/useSecret.ts b/app/react/docker/proxy/queries/secrets/useSecret.ts index d7e9aa30b..3c783b95f 100644 --- a/app/react/docker/proxy/queries/secrets/useSecret.ts +++ b/app/react/docker/proxy/queries/secrets/useSecret.ts @@ -1,4 +1,4 @@ -import { Secret } from 'docker-types/generated/1.41'; +import { Secret } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/tasks/useTasks.ts b/app/react/docker/proxy/queries/tasks/useTasks.ts index 099a5ed91..1f720d9cb 100644 --- a/app/react/docker/proxy/queries/tasks/useTasks.ts +++ b/app/react/docker/proxy/queries/tasks/useTasks.ts @@ -1,4 +1,4 @@ -import { Task } from 'docker-types/generated/1.41'; +import { Task } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/useEvents.ts b/app/react/docker/proxy/queries/useEvents.ts index 88e637886..cbf292ce5 100644 --- a/app/react/docker/proxy/queries/useEvents.ts +++ b/app/react/docker/proxy/queries/useEvents.ts @@ -1,4 +1,4 @@ -import { EventMessage } from 'docker-types/generated/1.41'; +import { EventMessage } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; import axios, { diff --git a/app/react/docker/proxy/queries/useInfo.ts b/app/react/docker/proxy/queries/useInfo.ts index 904a9c086..23458af1e 100644 --- a/app/react/docker/proxy/queries/useInfo.ts +++ b/app/react/docker/proxy/queries/useInfo.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { SystemInfo } from 'docker-types/generated/1.41'; +import { SystemInfo } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/usePlugins.ts b/app/react/docker/proxy/queries/usePlugins.ts index 1f88cb7d5..f33d47e84 100644 --- a/app/react/docker/proxy/queries/usePlugins.ts +++ b/app/react/docker/proxy/queries/usePlugins.ts @@ -3,7 +3,7 @@ import { Plugin, PluginInterfaceType, PluginsInfo, -} from 'docker-types/generated/1.41'; +} from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; @@ -87,7 +87,7 @@ export function aggregateData( (plugin) => plugin.Enabled && // docker has an error in their types, so we need to cast to unknown first - // see https://docs.docker.com/engine/api/v1.41/#tag/Plugin/operation/PluginList + // see https://docs.docker.com/engine/api/v1.44/#tag/Plugin/operation/PluginList plugin.Config.Interface.Types.includes( pluginTypeToVersionMap[pluginType] as unknown as PluginInterfaceType ) diff --git a/app/react/docker/proxy/queries/useSwarm.ts b/app/react/docker/proxy/queries/useSwarm.ts index 42f736f2c..f0d21454b 100644 --- a/app/react/docker/proxy/queries/useSwarm.ts +++ b/app/react/docker/proxy/queries/useSwarm.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { Swarm } from 'docker-types/generated/1.41'; +import { Swarm } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/proxy/queries/useVersion.ts b/app/react/docker/proxy/queries/useVersion.ts index 2021b685f..9e54a966f 100644 --- a/app/react/docker/proxy/queries/useVersion.ts +++ b/app/react/docker/proxy/queries/useVersion.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { SystemVersion } from 'docker-types/generated/1.41'; +import { SystemVersion } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/services/ItemView/PortMappingField/toRequest.ts b/app/react/docker/services/ItemView/PortMappingField/toRequest.ts index 38daf9a8b..e8daf7b01 100644 --- a/app/react/docker/services/ItemView/PortMappingField/toRequest.ts +++ b/app/react/docker/services/ItemView/PortMappingField/toRequest.ts @@ -1,4 +1,4 @@ -import { EndpointPortConfig } from 'docker-types/generated/1.41'; +import { EndpointPortConfig } from 'docker-types/generated/1.44'; import _ from 'lodash'; import { Values } from './PortsMappingField'; diff --git a/app/react/docker/services/ItemView/PortMappingField/toViewModel.ts b/app/react/docker/services/ItemView/PortMappingField/toViewModel.ts index 36433a43b..b0637fb9f 100644 --- a/app/react/docker/services/ItemView/PortMappingField/toViewModel.ts +++ b/app/react/docker/services/ItemView/PortMappingField/toViewModel.ts @@ -1,4 +1,4 @@ -import { EndpointPortConfig } from 'docker-types/generated/1.41'; +import { EndpointPortConfig } from 'docker-types/generated/1.44'; import _ from 'lodash'; import { PortBinding, Protocol, Value, isProtocol, isRange } from './types'; diff --git a/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx b/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx index 56ae02877..dd2ca7c91 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/columns/node.tsx @@ -1,4 +1,4 @@ -import { Node } from 'docker-types/generated/1.41'; +import { Node } from 'docker-types/generated/1.44'; import { CellContext } from '@tanstack/react-table'; import { useNodes } from '@/react/docker/proxy/queries/nodes/useNodes'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts index 889917986..372e9ef50 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/constraint-helper.ts @@ -1,4 +1,4 @@ -import { Node } from 'docker-types/generated/1.41'; +import { Node } from 'docker-types/generated/1.44'; import { ServiceViewModel } from '@/docker/models/service'; diff --git a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx index 53b3f2956..bc1f3aa4b 100644 --- a/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx +++ b/app/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/schedulingMode.tsx @@ -1,5 +1,5 @@ import { CellContext } from '@tanstack/react-table'; -import { Node } from 'docker-types/generated/1.41'; +import { Node } from 'docker-types/generated/1.44'; import { ServiceViewModel } from '@/docker/models/service'; import { useNodes } from '@/react/docker/proxy/queries/nodes/useNodes'; diff --git a/app/react/docker/services/common/convertServiceToConfig.ts b/app/react/docker/services/common/convertServiceToConfig.ts index e385b364a..2e08da60b 100644 --- a/app/react/docker/services/common/convertServiceToConfig.ts +++ b/app/react/docker/services/common/convertServiceToConfig.ts @@ -1,4 +1,4 @@ -import { Service } from 'docker-types/generated/1.41'; +import { Service } from 'docker-types/generated/1.44'; import { ServiceUpdateConfig } from '../types'; diff --git a/app/react/docker/services/queries/useCreateServiceMutation.ts b/app/react/docker/services/queries/useCreateServiceMutation.ts index 7d27e1807..0e314552f 100644 --- a/app/react/docker/services/queries/useCreateServiceMutation.ts +++ b/app/react/docker/services/queries/useCreateServiceMutation.ts @@ -1,4 +1,4 @@ -import { Service } from 'docker-types/generated/1.41'; +import { Service } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/services/queries/useService.ts b/app/react/docker/services/queries/useService.ts index f74fbd6cd..d38002ed4 100644 --- a/app/react/docker/services/queries/useService.ts +++ b/app/react/docker/services/queries/useService.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { Service } from 'docker-types/generated/1.41'; +import { Service } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/docker/services/queries/useServices.ts b/app/react/docker/services/queries/useServices.ts index 933bee497..ee09a3a51 100644 --- a/app/react/docker/services/queries/useServices.ts +++ b/app/react/docker/services/queries/useServices.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { Service } from 'docker-types/generated/1.41'; +import { Service } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { withGlobalError } from '@/react-tools/react-query'; diff --git a/app/react/docker/services/queries/useUpdateServiceMutation.ts b/app/react/docker/services/queries/useUpdateServiceMutation.ts index 30ca28733..846a281e1 100644 --- a/app/react/docker/services/queries/useUpdateServiceMutation.ts +++ b/app/react/docker/services/queries/useUpdateServiceMutation.ts @@ -1,4 +1,4 @@ -import { ServiceUpdateResponse } from 'docker-types/generated/1.41'; +import { ServiceUpdateResponse } from 'docker-types/generated/1.44'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/services/types.ts b/app/react/docker/services/types.ts index 1474959e3..3544d2e61 100644 --- a/app/react/docker/services/types.ts +++ b/app/react/docker/services/types.ts @@ -1,4 +1,4 @@ -import { ServiceSpec, TaskSpec } from 'docker-types/generated/1.41'; +import { ServiceSpec, TaskSpec } from 'docker-types/generated/1.44'; export type ServiceId = string; diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx index 7552bfa75..c4df59e0d 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTab.test.tsx @@ -126,7 +126,7 @@ describe('initial loading', () => { http.get('/api/endpoints/:id/docker/version', () => { versionFetched = true; return HttpResponse.json({ - ApiVersion: '1.41', + ApiVersion: '1.44', }); }) ); @@ -417,7 +417,7 @@ function setupMswHandlers({ shouldReturnEnv = true, shouldReturnSchema = true, envType = EnvironmentType.Docker, - apiVersion = 1.41, + apiVersion = 1.44, schema = { type: 'object', properties: {} }, stackUpdateResponse, }: { diff --git a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx index f176d07f1..ee6197dc9 100644 --- a/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx +++ b/app/react/docker/stacks/ItemView/StackEditorTab/StackEditorTabInner.test.tsx @@ -38,7 +38,7 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise) => ({ const defaultProps = { stackType: StackType.DockerCompose, composeSyntaxMaxVersion: 3, - apiVersion: 1.41, + apiVersion: 1.44, envType: EnvironmentType.Docker, schema: { type: 'object' } as JSONSchema7, isOrphaned: false, @@ -155,7 +155,7 @@ describe('conditional rendering - Prune services field', () => { it('should show Prune field for DockerCompose with API >= 1.27', async () => { renderComponent({ stackType: StackType.DockerCompose, - apiVersion: 1.41, + apiVersion: 1.44, }); await waitFor(() => { @@ -184,7 +184,7 @@ describe('conditional rendering - Prune services field', () => { it('should hide Prune field for Kubernetes stack', () => { renderComponent({ stackType: StackType.Kubernetes, - apiVersion: 1.41, + apiVersion: 1.44, }); expect(screen.queryByTestId('stack-prune-switch')).not.toBeInTheDocument(); @@ -274,7 +274,7 @@ describe('form field updates', () => { renderComponent( { stackType: StackType.DockerSwarm, - apiVersion: 1.41, + apiVersion: 1.44, }, { onSubmit } ); @@ -455,7 +455,7 @@ describe('authorization', () => { renderComponent( { stackType: StackType.DockerSwarm, - apiVersion: 1.41, + apiVersion: 1.44, }, { user: unauthorizedUser } ); diff --git a/app/react/docker/tasks/queries/useTask.ts b/app/react/docker/tasks/queries/useTask.ts index e6553ce92..8d0749fa5 100644 --- a/app/react/docker/tasks/queries/useTask.ts +++ b/app/react/docker/tasks/queries/useTask.ts @@ -1,4 +1,4 @@ -import { Task } from 'docker-types/generated/1.41'; +import { Task } from 'docker-types/generated/1.44'; import { useQuery } from '@tanstack/react-query'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/tasks/types.ts b/app/react/docker/tasks/types.ts index 8c1f1eb7d..f8991576d 100644 --- a/app/react/docker/tasks/types.ts +++ b/app/react/docker/tasks/types.ts @@ -1,4 +1,4 @@ -import { Task } from 'docker-types/generated/1.41'; +import { Task } from 'docker-types/generated/1.44'; export type TaskId = NonNullable; diff --git a/app/react/docker/volumes/queries/useCreateVolume.ts b/app/react/docker/volumes/queries/useCreateVolume.ts index 53384303b..3acfdfab7 100644 --- a/app/react/docker/volumes/queries/useCreateVolume.ts +++ b/app/react/docker/volumes/queries/useCreateVolume.ts @@ -1,4 +1,4 @@ -import { Volume, VolumeCreateOptions } from 'docker-types/generated/1.41'; +import { Volume, VolumeCreateOptions } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/volumes/queries/useCreateVolumeMutation.ts b/app/react/docker/volumes/queries/useCreateVolumeMutation.ts index c51c693b3..32d73ced3 100644 --- a/app/react/docker/volumes/queries/useCreateVolumeMutation.ts +++ b/app/react/docker/volumes/queries/useCreateVolumeMutation.ts @@ -1,4 +1,4 @@ -import { Volume } from 'docker-types/generated/1.41'; +import { Volume } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts b/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts index 1c4720afd..f07e18bfc 100644 --- a/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts +++ b/app/react/docker/volumes/queries/useRemoveVolumeMutation.ts @@ -1,4 +1,4 @@ -import { Volume } from 'docker-types/generated/1.41'; +import { Volume } from 'docker-types/generated/1.44'; import { EnvironmentId } from '@/react/portainer/environments/types'; import axios, { parseAxiosError } from '@/portainer/services/axios'; diff --git a/app/react/docker/volumes/queries/useVolume.ts b/app/react/docker/volumes/queries/useVolume.ts index 704d95f31..765e0e1ff 100644 --- a/app/react/docker/volumes/queries/useVolume.ts +++ b/app/react/docker/volumes/queries/useVolume.ts @@ -1,4 +1,4 @@ -import { Volume } from 'docker-types/generated/1.41'; +import { Volume } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { EnvironmentId } from '@/react/portainer/environments/types'; diff --git a/app/react/docker/volumes/queries/useVolumes.ts b/app/react/docker/volumes/queries/useVolumes.ts index 2e4ff1370..6733b4020 100644 --- a/app/react/docker/volumes/queries/useVolumes.ts +++ b/app/react/docker/volumes/queries/useVolumes.ts @@ -1,5 +1,5 @@ import { useQuery } from '@tanstack/react-query'; -import { Volume } from 'docker-types/generated/1.41'; +import { Volume } from 'docker-types/generated/1.44'; import axios, { parseAxiosError } from '@/portainer/services/axios'; import { buildDockerProxyUrl } from '@/react/docker/proxy/queries/buildDockerProxyUrl'; diff --git a/app/react/portainer/templates/app-templates/types.ts b/app/react/portainer/templates/app-templates/types.ts index f63d97435..78c577a3f 100644 --- a/app/react/portainer/templates/app-templates/types.ts +++ b/app/react/portainer/templates/app-templates/types.ts @@ -1,4 +1,4 @@ -import { RestartPolicy } from 'docker-types/generated/1.41'; +import { RestartPolicy } from 'docker-types/generated/1.44'; import { BasicTableSettings } from '@@/datatables/types'; diff --git a/app/react/portainer/templates/app-templates/view-model.ts b/app/react/portainer/templates/app-templates/view-model.ts index 3619caa20..04d6405ea 100644 --- a/app/react/portainer/templates/app-templates/view-model.ts +++ b/app/react/portainer/templates/app-templates/view-model.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { RestartPolicy } from 'docker-types/generated/1.41'; +import { RestartPolicy } from 'docker-types/generated/1.44'; import { PorImageRegistryModel } from 'Docker/models/porImageRegistry'; diff --git a/app/setup-tests/setup-handlers/docker.ts b/app/setup-tests/setup-handlers/docker.ts index fdb184600..b97413d92 100644 --- a/app/setup-tests/setup-handlers/docker.ts +++ b/app/setup-tests/setup-handlers/docker.ts @@ -1,5 +1,5 @@ import { http, HttpResponse } from 'msw'; -import { SystemInfo, SystemVersion } from 'docker-types/generated/1.41'; +import { SystemInfo, SystemVersion } from 'docker-types/generated/1.44'; export const dockerHandlers = [ http.get( diff --git a/package.json b/package.json index 7b5bd5519..686c0aabd 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "codemirror-json-schema": "^0.8.0", "core-js": "^3.19.3", "date-fns": "^2.29.3", - "docker-types": "^1.43.1", + "docker-types": "^1.45.0", "fast-json-patch": "^3.1.1", "file-saver": "^2.0.5", "filesize": "^10.1.6", diff --git a/yarn.lock b/yarn.lock index e9efc5c20..a662b1759 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9608,10 +9608,10 @@ dns-packet@^5.2.2: dependencies: "@leichtgewicht/ip-codec" "^2.0.1" -docker-types@^1.43.1: - version "1.43.1" - resolved "https://registry.yarnpkg.com/docker-types/-/docker-types-1.43.1.tgz#3f1a644e29c85392e95c207bba15f16b675dca2a" - integrity sha512-eiihBU5LvZlNaeh/hGycsaoeutlPJ/0vyvEKvuBWnyilCq+IRWnv9e2+oh6AIpXEuHiWFowwHXmIlKlt07X3Mw== +docker-types@^1.45.0: + version "1.45.0" + resolved "https://registry.yarnpkg.com/docker-types/-/docker-types-1.45.0.tgz#57f9eeb283364128fa472d25abc75563160aea4f" + integrity sha512-IvVAmwGbXVSEsD+Ld3pwIhCSm4YbnlZ9dPHbDVkgZUcE22MSkuIARREc7ipQ9JoMOzu7qMPD8H/KCpGnrZRo7A== doctrine@^2.1.0: version "2.1.0"