ScriptCollection 4.4.56__py3-none-any.whl → 4.4.57__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/OCIImages/OCIImageManager.py +11 -2
- ScriptCollection/ScriptCollectionCore.py +1 -1
- {scriptcollection-4.4.56.dist-info → scriptcollection-4.4.57.dist-info}/METADATA +1 -1
- {scriptcollection-4.4.56.dist-info → scriptcollection-4.4.57.dist-info}/RECORD +7 -7
- {scriptcollection-4.4.56.dist-info → scriptcollection-4.4.57.dist-info}/WHEEL +0 -0
- {scriptcollection-4.4.56.dist-info → scriptcollection-4.4.57.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.4.56.dist-info → scriptcollection-4.4.57.dist-info}/top_level.txt +0 -0
|
@@ -153,13 +153,22 @@ class OCIImageManager:
|
|
|
153
153
|
any download depend on a reachable registry.
|
|
154
154
|
A custom registry is typically not publicly readable, so the login to the registries which are defined for this machine is done
|
|
155
155
|
before the registry is asked; without it the answer would be that the image is not available although it only is not readable
|
|
156
|
-
without credentials.
|
|
156
|
+
without credentials. A failed login does not break the build: the login can fail because the registry is not reachable, because
|
|
157
|
+
the credentials are missing or wrong, or because the docker-daemon is not available at all, and in each of these cases the image
|
|
158
|
+
can not be taken from the custom registry. The login-failure is therefore treated like an image which is not available in the
|
|
159
|
+
custom registry, so that a warning is logged and the fallback-registry is used (see get_registry_address_for_image) instead of
|
|
160
|
+
aborting the build."""
|
|
157
161
|
image_with_tag=f"{custom_registry_address}:{tag}"
|
|
158
162
|
if image_with_tag not in self.__availability_of_image:
|
|
159
163
|
if self.__sc.local_docker_image_exists(custom_registry_address,tag):
|
|
160
164
|
self.__availability_of_image[image_with_tag]=True
|
|
161
165
|
else:
|
|
162
|
-
|
|
166
|
+
try:
|
|
167
|
+
self.__sc.login_to_defined_docker_registries()
|
|
168
|
+
except Exception as exception:
|
|
169
|
+
self.__sc.log.log(f"The login to the defined docker-registries failed, so the image \"{image_with_tag}\" is treated as not available in the custom registry \"{custom_registry_address}\" and the fallback-registry is used instead. Reason: {exception}",LogLevel.Warning)
|
|
170
|
+
self.__availability_of_image[image_with_tag]=False
|
|
171
|
+
return self.__availability_of_image[image_with_tag]
|
|
163
172
|
self.__availability_of_image[image_with_tag]=self.__sc.image_is_available_in_registry(custom_registry_address,tag)
|
|
164
173
|
return self.__availability_of_image[image_with_tag]
|
|
165
174
|
|
|
@@ -11,12 +11,12 @@ ScriptCollection/ProgramRunnerSudo.py,sha256=vwKq-MOcqsgiKhSf-MBUDBC_UyaU8evP3Ro
|
|
|
11
11
|
ScriptCollection/RepositoryDiagramGenerator.py,sha256=K_u2NW_p4ozdWD50irJEkkcDVa70TcUJpZN63TeXSLw,7092
|
|
12
12
|
ScriptCollection/RepositoryHistoryAnalyzer.py,sha256=u9141B9D-Kef-9uo3yR7BXKUMzIKLVsesnYk7H-cWm4,6157
|
|
13
13
|
ScriptCollection/SCLog.py,sha256=Fjf8Pdi63cXHGMxL_aI6A0dwGm7QIfrv3czjvpSUlaM,4705
|
|
14
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
14
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=gAe7T-ucIUveqoiZ_OBOJjweb8jNWooPni2_DvFgF1U,310633
|
|
15
15
|
ScriptCollection/TestKind.py,sha256=jqLJwNvQeyea7SZf-UFzMC9pM0znv4do7FIC1xq8u9M,1672
|
|
16
16
|
ScriptCollection/UnassignedVariablesCheck.py,sha256=8xNcp1D5HeOLO1a1NEerq2TsnpFhw7yzYPkaay-oisY,3804
|
|
17
17
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
18
18
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=UB0lUYdAjFk8RIgsikKELRWDMZPlR_zNgwvCJS1naVs,2455
|
|
19
|
-
ScriptCollection/OCIImages/OCIImageManager.py,sha256=
|
|
19
|
+
ScriptCollection/OCIImages/OCIImageManager.py,sha256=Yi_opHYlhLqjoYP_Z23dnNjnLbpc1kJS2vmjatUBDqY,25143
|
|
20
20
|
ScriptCollection/OCIImages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
21
21
|
ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebian.py,sha256=rty9SnftreYWLIwvdUn4LhiHqCTevb_tWuYWoOnRJuo,732
|
|
22
22
|
ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebianSlim.py,sha256=M-4qxKWBZRtKdYQ-uXgfrxRBoZTXEjgqCxFXyFxTyzc,736
|
|
@@ -73,8 +73,8 @@ ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=yyjWPMHQjPLkML
|
|
|
73
73
|
ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
74
74
|
ScriptCollection/TFCPS/TypeScript/TFCPS_CodeUnitSpecific_TypeScript.py,sha256=ILVhJHvwG5TvPBBqSvyACYb7W9QnWrJpxKgHu8IQu4g,9249
|
|
75
75
|
ScriptCollection/TFCPS/TypeScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
76
|
-
scriptcollection-4.4.
|
|
77
|
-
scriptcollection-4.4.
|
|
78
|
-
scriptcollection-4.4.
|
|
79
|
-
scriptcollection-4.4.
|
|
80
|
-
scriptcollection-4.4.
|
|
76
|
+
scriptcollection-4.4.57.dist-info/METADATA,sha256=Cb2gmA45xDjGbjh8HrYJ-VlSw4QNsspAfFscWCSQ3cE,8032
|
|
77
|
+
scriptcollection-4.4.57.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
|
|
78
|
+
scriptcollection-4.4.57.dist-info/entry_points.txt,sha256=--Xk3EcTa14uk1YnUD8CQ2naQjNKJFohScd1ONy4CeY,6135
|
|
79
|
+
scriptcollection-4.4.57.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
80
|
+
scriptcollection-4.4.57.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|