ScriptCollection 4.2.2__py3-none-any.whl → 4.2.4__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -35,7 +35,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.2"
+version = "4.2.4"
 __version__ = version
 
 
@@ -128,6 +128,7 @@ class ScriptCollectionCore:
         if fallback_registry is None:
             raise ValueError(f"For image \"{image}\" no cache-registry and no default-registry is defined.",LogLevel.Warning)
         else:
+            self.log.log(f"Using fallback-registry for image \"{image}\".",LogLevel.Warning)
             return f"{fallback_registry}/{image}{tag_with_colon}"
         
     @GeneralUtilities.check_arguments

ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py

@@ -52,7 +52,7 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
         sbom_folder = os.path.join(artifacts_folder, "BOM")
         codeunitversion = self.tfcps_Tools_General.get_version_of_codeunit(self.get_codeunit_file())
         GeneralUtilities.ensure_directory_exists(sbom_folder)
-        self._protected_sc.run_program_argsasarray("docker", ["run","--rm","-v","/var/run/docker.sock:/var/run/docker.sock","-v","./BOM:/BOM",self._protected_sc.get_image_with_registry_for_docker_image("syft","image","docker.io/anchore/syft"),f"{codeunitname_lower}:{codeunitversion}","-o",f"cyclonedx-xml=/BOM/{codeunitname}.{codeunitversion}.sbom.xml"], artifacts_folder, print_errors_as_information=True)
+        self._protected_sc.run_program_argsasarray("docker", ["run","--rm","-v","/var/run/docker.sock:/var/run/docker.sock","-v","./BOM:/BOM",self._protected_sc.get_image_with_registry_for_docker_image("syft",None,"docker.io/anchore/syft"),f"{codeunitname_lower}:{codeunitversion}","-o",f"cyclonedx-xml=/BOM/{codeunitname}.{codeunitversion}.sbom.xml"], artifacts_folder, print_errors_as_information=True)
         self._protected_sc.format_xml_file(sbom_folder+f"/{codeunitname}.{codeunitversion}.sbom.xml")
  
     @GeneralUtilities.check_arguments

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1370,11 +1370,28 @@ class TFCPS_Tools_General:
 
 
     @GeneralUtilities.check_arguments
-    def pull_images_of_test_services(self,repository_folder:str):
+    def pull_images_of_test_services(self,repository_folder:str,env_variables:dict[str,str],fallback_registries:dict[str,str]):
+        if env_variables is None:
+            env_variables={}
+        if fallback_registries is None:
+            fallback_registries={}
+        for image,fallback_registry in fallback_registries.items():
+            env_variables[f"image_{image}"]=self.__sc.get_image_with_registry_for_docker_image(image,None,fallback_registry)
         test_services=GeneralUtilities.get_direct_folders_of_folder(os.path.join(repository_folder,"Other","Resources","LocalTestServices"))
         if 0<len(test_services):
             self.__sc.log.log("Pull images for local test-services...")
         for test_service_folder in test_services:
             test_service_name=os.path.basename(test_service_folder)
             self.__sc.log.log(f"Pull image for test-service {test_service_name}...")
-            self.__sc.run_program("docker",f"compose -f docker-compose.yml pull --quiet",test_service_folder,print_live_output=self.__sc.log.loglevel==LogLevel.Debug)
+            arguments=f"compose -f docker-compose.yml pull --quiet"
+            if env_variables:
+                env_variables_file=os.path.join(test_service_folder,"Parameters.env")
+                GeneralUtilities.ensure_file_exists(env_variables_file)
+                lines=[]
+                for k,v in env_variables.items():
+                    lines=lines+[f"{k}={v}"]
+                GeneralUtilities.write_lines_to_file(env_variables_file,lines)
+                arguments=arguments+" --env-file Parameters.env"
+            else:
+                GeneralUtilities.ensure_file_does_not_exist(env_variables_file)
+            self.__sc.run_program("docker",arguments,test_service_folder,print_live_output=self.__sc.log.loglevel==LogLevel.Debug)

{scriptcollection-4.2.2.dist-info → scriptcollection-4.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 4.2.2
+Version: 4.2.4
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-4.2.2.dist-info → scriptcollection-4.2.4.dist-info}/RECORD

@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
 ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
-ScriptCollection/ScriptCollectionCore.py,sha256=h5_HW27_9b3xAq1F0jByePR0e0XU78iABOQOIrnVNrk,154465
+ScriptCollection/ScriptCollectionCore.py,sha256=afwDgTa6_jR8l7XNyZHhiDcafcdeWaW8z_oxukCdTYU,154559
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=WRFdmkPrzAO9P7ue-5BH1DZfqmGN9yyb2AouFuv2MiI,27712
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=vnNrwvNePvW2dQhnSusBjgvOssI3a1P3g94bNxNIr3o,8069
@@ -19,9 +19,9 @@ ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv
 ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=6FRnTL9XR7Ks-WyFWE6y9w7E54NWPnD1XENTgSrVI-E,7588
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=-7ZtiLAUp0vdgnVHhcjX_WQSVR1Jgbqj1bANrXoQDMw,22347
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=yFWbW51Pt-oEpBlO9Fg8BvSM3bhUmtk__BllgtX6aqI,87785
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=vt4HhzkLL-qUq7wXnw7DxugVAR7GO6UErOQj2ZagIBc,88760
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=ol_Ocfj-jl34wSxHeCIFlG8vSdSYRg9PUnJhDeNdq_I,10378
+ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=d70eGwaFXz2ba-5-Mh_vNlWT8aTj05-qmmQlh4TwRhY,10375
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
@@ -36,8 +36,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=aXC_f39edp
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=nLw_eSUd_56jjgfcAvtUyzecSZ14mYmNJl0iu-1YNVk,13496
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.2.dist-info/METADATA,sha256=XmT3BgR6Y2pDcng5_anKCpMEAVO-wvjRFtc4uaDgnaE,7689
-scriptcollection-4.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.2.2.dist-info/entry_points.txt,sha256=6Az2eMD7luwGPSdoIhJ1y6ZtgxsfezgJCsFhOnyhnwM,4627
-scriptcollection-4.2.2.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.2.dist-info/RECORD,,
+scriptcollection-4.2.4.dist-info/METADATA,sha256=y_TI6aHc-harENu_Ik7-vUiKUDBs3bloRZ9TYNg-26Q,7689
+scriptcollection-4.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.2.4.dist-info/entry_points.txt,sha256=6Az2eMD7luwGPSdoIhJ1y6ZtgxsfezgJCsFhOnyhnwM,4627
+scriptcollection-4.2.4.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.4.dist-info/RECORD,,