docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump default API version to 1.45 (Moby 26.0/26.1) 

- Update API version to the latest maintained release.
0 Adjust tests for API 1.45

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2024-05-22 15:12:42 +02:00
parent a8bac88221
commit e47e966e94
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
TEST_API_VERSION ?= 1.44 TEST_API_VERSION ?= 1.45
TEST_ENGINE_VERSION ?= 25.0 TEST_ENGINE_VERSION ?= 26.1
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
PLATFORM := Windows PLATFORM := Windows

2
docker/constants.py
View File

@ -2,7 +2,7 @@ import sys
from .version import __version__ from .version import __version__
DEFAULT_DOCKER_API_VERSION = '1.44' DEFAULT_DOCKER_API_VERSION = '1.45'
MINIMUM_DOCKER_API_VERSION = '1.24' MINIMUM_DOCKER_API_VERSION = '1.24'
DEFAULT_TIMEOUT_SECONDS = 60 DEFAULT_TIMEOUT_SECONDS = 60
STREAM_HEADER_SIZE_BYTES = 8 STREAM_HEADER_SIZE_BYTES = 8

4
tests/Dockerfile-ssh-dind
View File

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG API_VERSION=1.44 ARG API_VERSION=1.45
ARG ENGINE_VERSION=25.0 ARG ENGINE_VERSION=26.1
FROM docker:${ENGINE_VERSION}-dind FROM docker:${ENGINE_VERSION}-dind

11
tests/integration/models_containers_test.py
View File

@ -131,10 +131,9 @@ class ContainerCollectionTest(BaseIntegrationTest):
assert 'NetworkSettings' in attrs assert 'NetworkSettings' in attrs
assert 'Networks' in attrs['NetworkSettings'] assert 'Networks' in attrs['NetworkSettings']
assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name] assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name]
# Expect Aliases to list 'test_alias' and the container's short-id. # Aliases no longer include the container's short-id in API v1.45.
# In API version 1.45, the short-id will be removed.
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] \ assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] \
== [test_alias, attrs['Id'][:12]] == [test_alias]
assert attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] \ assert attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] \
== test_driver_opt == test_driver_opt
@ -191,9 +190,9 @@ class ContainerCollectionTest(BaseIntegrationTest):
assert 'NetworkSettings' in attrs assert 'NetworkSettings' in attrs
assert 'Networks' in attrs['NetworkSettings'] assert 'Networks' in attrs['NetworkSettings']
assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name] assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name]
# Aliases should include the container's short-id (but it will be removed # Aliases no longer include the container's short-id in API v1.45.
# in API v1.45). assert (attrs['NetworkSettings']['Networks'][net_name]['Aliases']
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] == [attrs["Id"][:12]] is None)
assert (attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] assert (attrs['NetworkSettings']['Networks'][net_name]['DriverOpts']
is None) is None)