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

Merge pull request #3231 from vvoland/engine-25 

Bump default API version to 1.44 (Moby 25.0)
This commit is contained in:
Paweł Gronowski 2024-03-25 17:36:55 +01:00 committed by GitHub
parent bd164f928a dd82f9ae8e
commit 3d79ce8c60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 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.43 TEST_API_VERSION ?= 1.44
TEST_ENGINE_VERSION ?= 24.0 TEST_ENGINE_VERSION ?= 25.0
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
PLATFORM := Windows PLATFORM := Windows

4
docker/constants.py
View File

@ -1,8 +1,8 @@
import sys import sys
from .version import __version__ from .version import __version__
DEFAULT_DOCKER_API_VERSION = '1.43' DEFAULT_DOCKER_API_VERSION = '1.44'
MINIMUM_DOCKER_API_VERSION = '1.21' MINIMUM_DOCKER_API_VERSION = '1.24'
DEFAULT_TIMEOUT_SECONDS = 60 DEFAULT_TIMEOUT_SECONDS = 60
STREAM_HEADER_SIZE_BYTES = 8 STREAM_HEADER_SIZE_BYTES = 8
CONTAINER_LIMITS_KEYS = [ CONTAINER_LIMITS_KEYS = [

4
tests/Dockerfile-ssh-dind
View File

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

14
tests/integration/models_containers_test.py
View File

@ -110,12 +110,12 @@ class ContainerCollectionTest(BaseIntegrationTest):
client.networks.create(net_name) client.networks.create(net_name)
self.tmp_networks.append(net_name) self.tmp_networks.append(net_name)
test_aliases = ['hello'] test_alias = 'hello'
test_driver_opt = {'key1': 'a'} test_driver_opt = {'key1': 'a'}
networking_config = { networking_config = {
net_name: client.api.create_endpoint_config( net_name: client.api.create_endpoint_config(
aliases=test_aliases, aliases=[test_alias],
driver_opt=test_driver_opt driver_opt=test_driver_opt
) )
} }
@ -132,8 +132,10 @@ 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]
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] == \ # Expect Aliases to list 'test_alias' and the container's short-id.
test_aliases # In API version 1.45, the short-id will be removed.
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] \
== [test_alias, attrs['Id'][:12]]
assert attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] \ assert attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] \
== test_driver_opt == test_driver_opt
@ -190,7 +192,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]
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] is None # Aliases should include the container's short-id (but it will be removed
# in API v1.45).
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] == [attrs["Id"][:12]]
assert (attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] assert (attrs['NetworkSettings']['Networks'][net_name]['DriverOpts']
is None) is None)