Skip to content

Add support for platform parameter in image push #3325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion docker/api/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def pull(self, repository, tag=None, stream=False, auth_config=None,
return self._result(response)

def push(self, repository, tag=None, stream=False, auth_config=None,
decode=False):
decode=False, platform=None):
"""
Push an image or a repository to the registry. Similar to the ``docker
push`` command.
Expand All @@ -448,6 +448,7 @@ def push(self, repository, tag=None, stream=False, auth_config=None,
``username`` and ``password`` keys to be valid.
decode (bool): Decode the JSON data from the server into dicts.
Only applies with ``stream=True``
platform (str): JSON-encoded OCI platform to select the platform-variant to push. If not provided, all available variants will attempt to be pushed.

Returns:
(generator or str): The output from the server.
Expand Down Expand Up @@ -488,6 +489,13 @@ def push(self, repository, tag=None, stream=False, auth_config=None,
log.debug('Sending supplied auth config')
headers['X-Registry-Auth'] = auth.encode_header(auth_config)

if platform is not None:
if utils.version_lt(self._version, '1.46'):
raise errors.InvalidVersion(
'platform was only introduced in API version 1.46'
)
params['platform'] = platform

response = self._post_json(
u, None, headers=headers, stream=stream, params=params
)
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/api_image_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import docker
from docker import auth

from ..helpers import requires_api_version
from . import fake_api
from .api_test import (
DEFAULT_TIMEOUT_SECONDS,
Expand Down Expand Up @@ -271,6 +272,28 @@ def test_push_image_with_auth(self):
timeout=DEFAULT_TIMEOUT_SECONDS
)

@requires_api_version('1.46')
def test_push_image_with_platform(self):
with mock.patch('docker.auth.resolve_authconfig',
fake_resolve_authconfig):
self.client.push(
fake_api.FAKE_IMAGE_NAME,
platform=fake_api.FAKE_PLATFORM
)

fake_request.assert_called_with(
'POST',
f"{url_prefix}images/test_image/push",
params={
'tag': None,
'platform': fake_api.FAKE_PLATFORM
},
data='{}',
headers={'Content-Type': 'application/json'},
stream=False,
timeout=DEFAULT_TIMEOUT_SECONDS
)

def test_push_image_stream(self):
with mock.patch('docker.auth.resolve_authconfig',
fake_resolve_authconfig):
Expand Down
1 change: 1 addition & 0 deletions tests/unit/fake_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
FAKE_SECRET_NAME = 'super_secret'
FAKE_CONFIG_ID = 'sekvs771242jfdjnvfuds8232'
FAKE_CONFIG_NAME = 'super_config'
FAKE_PLATFORM = "{'os': 'linux','architecture': 'arm','variant': 'v5'}"

# Each method is prefixed with HTTP method (get, post...)
# for clarity and readability
Expand Down