summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2022-03-01 12:34:28 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2022-03-01 11:40:22 +0000
commit055aa4b41b5c58f23b9948286c9306cee103d7d4 (patch)
tree89d4f5b7999d04c2f0f47412282f966a4326c1aa
parent30a9fb218c3c8e7f75ba86e57b1d27b1348f2d43 (diff)
[BUILD] Fix docker mirror handling
In case image originates from same repository that is used as a docker mirror do not try to retag the image (to the same name which would end with error) Change-Id: I4c43315d5633e39a347492d2b2065bdddfead6fb Issue-ID: INT-1429 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
-rwxr-xr-xbuild/download/docker_downloader.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/download/docker_downloader.py b/build/download/docker_downloader.py
index c767aa9e..9897325d 100755
--- a/build/download/docker_downloader.py
+++ b/build/download/docker_downloader.py
@@ -164,9 +164,11 @@ class DockerDownloader(ConcurrentDownloader):
if (len(image_name_split) > 1) \
and (image_name_split[0].find(".")) >= 0 \
and not (image_name.startswith('docker.io/')) \
+ and not (image_name.startswith(self._mirror)) \
and (image_name_split[0] not in self._mirror_exclude):
# if image originates from private registry and its name does not start with 'docker.io'
# and it does not originate from excluded registry
+ # and docker mirror name differs from private registry name
# -> download image from docker mirror and retag it to its original name
mirrored_image_name = self._mirror + "/" + '/'.join(image_name_split[1:])
img = self._docker_client.images.pull(mirrored_image_name)