From 2eda533a74aafc079ec55edf6a36ecb327cbb11f Mon Sep 17 00:00:00 2001 From: iaz1607 Date: Thu, 15 May 2025 10:49:37 +0300 Subject: Swap url=alias in DOCKER_IMAGE commit_hash:48c160a92e2ea7a2176e175f71559ba53595c05e --- build/plugins/_dart_fields.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py index 4050906f41e..18d51748bc7 100644 --- a/build/plugins/_dart_fields.py +++ b/build/plugins/_dart_fields.py @@ -993,16 +993,27 @@ class DockerImage: link ) else: - msg = 'Invalid docker image: {}. Image should be provided in format ='.format(img) + msg = 'Invalid docker image: {}. Image should be provided in format ='.format(img) if msg: ymake.report_configure_error(msg) raise DartValueError(msg) + @staticmethod + def unify_images(images): + res = [] + for image in images: + if not image.startswith('docker://'): + alias, url = image.split('=', 1) + image = url + "=" + alias + res.append(image) + return res + @classmethod def value(cls, unit, flat_args, spec_args): - raw_value = get_values_list(unit, 'DOCKER_IMAGES_VALUE') - images = sorted(raw_value) + images = get_values_list(unit, 'DOCKER_IMAGES_VALUE') if images: + images = cls.unify_images(images) + images = sorted(images) cls._validate(images) return {cls.KEY: serialize_list(images)} -- cgit v1.3