ScriptCollection 4.2.78__py3-none-any.whl → 4.2.79__py3-none-any.whl

ScriptCollection/Executables.py

@@ -10,6 +10,7 @@ from .GeneralUtilities import GeneralUtilities
 from .SCLog import LogLevel, SCLog
 from .TFCPS.TFCPS_CodeUnit_BuildCodeUnits import TFCPS_CodeUnit_BuildCodeUnits
 from .TFCPS.TFCPS_Tools_General import TFCPS_Tools_General
+from .OCIImages.OCIImageManager import OCIImageManager
 
 def FilenameObfuscator() -> int:
     parser = argparse.ArgumentParser(description=''''Obfuscates the names of all files in the given folder.
@@ -745,7 +746,14 @@ def OCRAnalysisOfRepository() -> int:
 
 
 def UpdateImagesInDockerComposeFile() -> int:
-    #TODO use OCIImageUpdater
+    parser = argparse.ArgumentParser(description="This function updates images in a Docker Compose file.")
+    parser.add_argument('-f', '--file', required=False,default="./docker-compose.yml")
+    #TODO add possibility to set version-echolon for each image specifically and pass this information to OCIImageManager
+    args = parser.parse_args()
+    sc = ScriptCollectionCore()
+    file=GeneralUtilities.resolve_relative_path(args.file, os.getcwd())
+    oci=OCIImageManager(sc)
+    oci.update_image_in_docker_compose_file(file)
     return 0
 
 

ScriptCollection/GeneralUtilities.py

@@ -34,6 +34,7 @@ class VersionEcholon(Enum):
     LatestPatchOrLatestMinor = 1
     LatestPatchOrLatestMinorOrNextMajor = 2
     LatestVersion = 3
+    CustomAlgorithm = 4
 
 class Platform(Enum):
     Windows_AMD64 = 0

ScriptCollection/OCIImages/AbstractImageHandler.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from packaging.version import Version
-from ..GeneralUtilities import GeneralUtilities
+from ..GeneralUtilities import GeneralUtilities, VersionEcholon
 
 class AbstractImageHandler(ABC):
     
@@ -26,9 +26,13 @@ class AbstractImageHandler(ABC):
         raise NotImplementedError()#because it is abstract
 
     @abstractmethod
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
         raise NotImplementedError()#because it is abstract
 
     @abstractmethod
-    def version_to_tag(self,image_name:str,registry_address:str,version:Version)->str:
+    def version_to_tag(self,image_name:str,version:Version)->str:
+        raise NotImplementedError()#because it is abstract
+
+    @abstractmethod
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
         raise NotImplementedError()#because it is abstract

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebian.py

@@ -1,4 +1,6 @@
 from packaging.version import Version
+
+from ScriptCollection.build.lib.ScriptCollection.GeneralUtilities import VersionEcholon
 from ..AbstractImageHandler import AbstractImageHandler
 
 class ImageHandlerDebian(AbstractImageHandler):
@@ -9,8 +11,11 @@ class ImageHandlerDebian(AbstractImageHandler):
     def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
         raise NotImplementedError()
 
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
         raise NotImplementedError()
     
-    def version_to_tag(self,image_name:str,registry_address:str,version:Version)->str:
+    def version_to_tag(self,image_name:str,version:Version)->str:
         raise NotImplementedError()
+
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
+        return VersionEcholon.LatestPatch

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebianSlim.py

@@ -1,4 +1,6 @@
 from packaging.version import Version
+
+from ScriptCollection.ScriptCollection.GeneralUtilities import VersionEcholon
 from ..AbstractImageHandler import AbstractImageHandler
 
 class ImageHandlerDebianSlim(AbstractImageHandler):
@@ -9,8 +11,11 @@ class ImageHandlerDebianSlim(AbstractImageHandler):
     def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
         raise NotImplementedError()
 
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
         raise NotImplementedError()
     
-    def version_to_tag(self,image_name:str,registry_address:str,version:Version)->str:
+    def version_to_tag(self,image_name:str,version:Version)->str:
         raise NotImplementedError()
+
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
+        return VersionEcholon.LatestPatch

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGeneric.py

@@ -1,4 +1,6 @@
 from packaging.version import Version
+
+from ScriptCollection.build.lib.ScriptCollection.GeneralUtilities import VersionEcholon
 from ..AbstractImageHandler import AbstractImageHandler
 
 class ImageHandlerGeneric(AbstractImageHandler):
@@ -9,8 +11,11 @@ class ImageHandlerGeneric(AbstractImageHandler):
     def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
         raise NotImplementedError()
 
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
+        raise NotImplementedError()
+
+    def version_to_tag(self,image_name:str,version:Version)->str:
         raise NotImplementedError()
 
-    def version_to_tag(self,image_name:str,registry_address:str,version:Version)->str:
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
         raise NotImplementedError()

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGenericV.py

@@ -1,4 +1,6 @@
 from packaging.version import Version
+
+from ScriptCollection.ScriptCollection.GeneralUtilities import VersionEcholon
 from ..AbstractImageHandler import AbstractImageHandler
 
 class ImageHandlerGenericV(AbstractImageHandler):
@@ -9,8 +11,11 @@ class ImageHandlerGenericV(AbstractImageHandler):
     def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
         raise NotImplementedError()
 
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
+        raise NotImplementedError()
+
+    def version_to_tag(self,image_name:str,version:Version)->str:
         raise NotImplementedError()
 
-    def version_to_tag(self,image_name:str,registry_address:str,version:Version)->str:
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
         raise NotImplementedError()

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGitlabCE.py

@@ -0,0 +1,21 @@
+from packaging.version import Version
+
+from ScriptCollection.build.lib.ScriptCollection.GeneralUtilities import VersionEcholon
+from ..AbstractImageHandler import AbstractImageHandler
+
+class ImageHandlerGitlabCE(AbstractImageHandler):
+
+    def can_handle(self,image_name:str)->bool:
+        raise NotImplementedError()#TODO
+
+    def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
+        raise NotImplementedError()
+
+    def tag_to_version(self,image_name:str,tag:str)->Version:
+        raise NotImplementedError()
+    
+    def version_to_tag(self,image_name:str,version:Version)->str:
+        raise NotImplementedError()
+
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
+        return VersionEcholon.CustomAlgorithm

ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGitlabEE.py

@@ -0,0 +1,21 @@
+from packaging.version import Version
+
+from ScriptCollection.ScriptCollection.GeneralUtilities import VersionEcholon
+from ..AbstractImageHandler import AbstractImageHandler
+
+class ImageHandlerGitlabEE(AbstractImageHandler):
+
+    def can_handle(self,image_name:str)->bool:
+        raise NotImplementedError()#TODO
+
+    def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
+        raise NotImplementedError()
+
+    def tag_to_version(self,image_name:str,tag:str)->Version:
+        raise NotImplementedError()
+    
+    def version_to_tag(self,image_name:str,version:Version)->str:
+        raise NotImplementedError()
+
+    def get_default_echolon_for_update(self,image_name:str)->VersionEcholon:
+        return VersionEcholon.CustomAlgorithm

ScriptCollection/OCIImages/OCIImageManager.py

@@ -1,10 +1,17 @@
 import os
+from unittest import result
 from packaging.version import Version
 from ..GeneralUtilities import GeneralUtilities
 from ..ScriptCollectionCore import ScriptCollectionCore
 from ..GeneralUtilities import VersionEcholon
+from ..SCLog import LogLevel
 from .AbstractImageHandler import AbstractImageHandler
+from .ConcreteImageHandlers.ImageHandlerDebian import ImageHandlerDebian
 from .ConcreteImageHandlers.ImageHandlerDebianSlim import ImageHandlerDebianSlim
+from .ConcreteImageHandlers.ImageHandlerGeneric import ImageHandlerGeneric
+from .ConcreteImageHandlers.ImageHandlerGenericV import ImageHandlerGenericV
+from .ConcreteImageHandlers.ImageHandlerGitlabCE import ImageHandlerGitlabCE
+from .ConcreteImageHandlers.ImageHandlerGitlabEE import ImageHandlerGitlabEE
 
 class OCIImageManager:
 
@@ -15,8 +22,14 @@ class OCIImageManager:
         if sc is None:
             sc=ScriptCollectionCore()
         self.__sc=sc
-        self.image_handler=[]
-        self.image_handler.append(ImageHandlerDebianSlim())
+        self.image_handler=[
+            ImageHandlerDebian(),
+            ImageHandlerDebianSlim(),
+            ImageHandlerGeneric(),
+            ImageHandlerGenericV(),
+            ImageHandlerGitlabCE(),
+            ImageHandlerGitlabEE(),
+        ]
 
     def get_image_handler(self,image_name:str)->AbstractImageHandler:
         for image_handler in self.image_handler: 
@@ -87,23 +100,80 @@ class OCIImageManager:
     def get_registry_address_for_image_with_default_tag(self,repository:str,image_name:str,strict_mode:bool=True)->str:
         return f"{self.get_registry_address_for_image(repository,image_name)}:{self.get_tag_for_image(repository,image_name,strict_mode)}"
 
-    def update_default_tag_for_image(self,repository:str,image_name:str,echolon:VersionEcholon,search_in_custom_registry_only_if_available:bool)->None:
-        pass#TODO update in ImageDefinition.csv using get_available_versions_of_image_which_are_newer
-
-    def get_available_versions_of_image_which_are_newer(self,image_name:str,registry_address:str,outdated_version:Version,echolon:VersionEcholon,search_in_custom_registry_only_if_available:bool)->list[Version]:
-        return []#TODO calculate this using get_available_tags_of_image and echolon
+    def update_default_tag_for_images_in_image_definitions_file(self,repository:str,search_in_custom_registry_only_if_available:bool)->None:
+        file=f"{repository}/.ScriptCollection/OCIImages/ImageDefinition.csv"
+        GeneralUtilities.assert_file_exists(file)
+        lines=GeneralUtilities.read_nonempty_lines_from_file(file)
+        new_lines:list[str]=[]
+        #file looks like:
+        #ImageName;UpstreamRegistryAddress;DefaultTag
+        #Debian;docker.io/library/debian;13.4-slim
+        for line in lines:
+            if line.startswith("ImageName;"): #header line
+                new_lines.append(line)
+                continue
+            splitted_line=line.split(";")
+            image_name=splitted_line[0]
+            registry_address=splitted_line[1]
+            default_tag=splitted_line[2]
+            tag=default_tag
+            try:
+                addresses_to_check=[]
+                if self.custom_registry_is_defined(image_name):
+                    addresses_to_check.append(self.get_registry_address_for_image(repository,image_name))
+                else:
+                    if search_in_custom_registry_only_if_available:
+                        raise ValueError(f"No custom registry defined for image {image_name}.")
+                if not search_in_custom_registry_only_if_available:
+                    addresses_to_check.append(registry_address)
+                newest_versions:set[Version]=[default_tag]
+                current_version=Version(default_tag)
+                for address in addresses_to_check:
+                    newest_versions_for_address=self.get_available_versions_of_image_which_are_newer(image_name,address,current_version,VersionEcholon.LatestVersion)
+                    if newest_versions_for_address is not None:
+                        newest_versions.update(newest_versions_for_address)
+                GeneralUtilities.assert_condition(len(newest_versions)>0,f"Could not find any version for image {image_name} in registry {registry_address}.")
+                newest_version=max(newest_versions)
+                tag=self.version_to_tag(image_name,newest_version)
+            except Exception as e:
+                self.__sc.log.log(f"Could not get tag for image {image_name} from registry {registry_address}. Reason: {str(e)}",LogLevel.Warning)
+            new_lines.append(f"{image_name};{registry_address};{tag}")
+        GeneralUtilities.write_lines_to_file(file,new_lines)
 
+    def get_available_versions_of_image_which_are_newer(self,image_name:str,registry_address:str,current_version:Version,echolon: VersionEcholon)->Version:
+        image_handler=self.get_image_handler(image_name)
+        result= None #TODO calculate result using get_available_tags_of_image.
+        #TODO if echolon is not none, then use echolon instead of the default echolon of the image-handler.
+        #TODO return the versions sorted.
+        #TODO if result is empty: return None
+        return result
+    
     def get_available_tags_of_image(self,image_name:str,registry_address:str)->list[str]:
         """registry_address must have one of theese formats: "myregistry.example.com/debian" or "docker.io/debian" or "docker.io/myuser/debian".
         returns something like ["13.2-slim", "13.2", "13.3-slim", "13.3"]."""
         return self.get_image_handler(image_name).get_available_tags_of_image(image_name,registry_address)
 
-    def tag_to_version(self,image_name:str,registry_address:str,tag:str)->Version:
+    def tag_to_version(self,image_name:str,tag:str)->Version:
         """registry_address must have one of theese formats: "myregistry.example.com/debian" or "docker.io/debian" or "docker.io/myuser/debian"."""
-        return self.get_image_handler(image_name).tag_to_version(image_name,registry_address, tag)
+        return self.get_image_handler(image_name).tag_to_version(image_name, tag)
 
-    def version_to_tag(self,image_name:str,registry_address,version:Version)->str:
+    def version_to_tag(self,image_name:str,version:Version)->str:
         """registry_address must have one of theese formats: "myregistry.example.com/debian" or "docker.io/debian" or "docker.io/myuser/debian".
         returns something like "13.3-slim".
         If there are multiple tags available for a certain version then the image-handler decides which one will be returned."""
-        return self.get_image_handler(image_name).version_to_tag(image_name,registry_address,version)
+        return self.get_image_handler(image_name).version_to_tag(image_name,version)
+
+    def get_images_used_in_docker_compose_file(self,docker_compose_file:str)->dict[str,tuple[str,str,str]]:#returns dict[service_name,[image_name,image_address,current_tag]]
+        GeneralUtilities.assert_file_exists(docker_compose_file)
+        return {}#TODO implement function
+
+    def update_image_in_docker_compose_file(self,docker_compose_file:str)->None:
+        for service,service_information in self.get_images_used_in_docker_compose_file(docker_compose_file).items():
+            image_name=service_information[0]
+            image_address=service_information[1]
+            current_tag=service_information[2]
+            image_handler=self.get_image_handler(image_name)
+            new_versions_for_address=self.get_available_versions_of_image_which_are_newer(image_name,image_address,self.tag_to_version(image_name,current_tag),image_handler.get_default_echolon_for_update())
+            new_tag=self.version_to_tag(image_name,new_versions_for_address)
+            #TODO update tag for service in docker-compose-file to new_tag
+        

ScriptCollection/ScriptCollectionCore.py

@@ -38,7 +38,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.78"
+version = "4.2.79"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -1998,6 +1998,12 @@ class ScriptCollectionCore:
             return self.program_runner.run_program(program, arguments, working_directory, custom_argument, interactive)
         return self.run_program_argsasarray(program, GeneralUtilities.arguments_to_array(arguments), working_directory,  print_errors_as_information, log_file, timeoutInSeconds, addLogOverhead, title, log_namespace, GeneralUtilities.arguments_to_array(arguments_for_log), throw_exception_if_exitcode_is_not_zero, custom_argument, interactive, print_live_output)
 
+    # Return-values program_runner: Exitcode, StdOut, StdErr, Pid
+    @GeneralUtilities.check_arguments
+    def run_program_argsasarray_with_retry(self, program: str, arguments_as_array: list[str] = [], working_directory: str = None,  print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, throw_exception_if_exitcode_is_not_zero: bool = True, custom_argument: object = None, interactive: bool = False, print_live_output: bool = False, amount_of_attempts: int = 5, delay_in_seconds: int = 2) -> tuple[int, str, str, int]:
+        return GeneralUtilities.retry_action(lambda: self.run_program_argsasarray(program, arguments_as_array, working_directory, print_errors_as_information, log_file, timeoutInSeconds, addLogOverhead, title, log_namespace,arguments_for_log, throw_exception_if_exitcode_is_not_zero, custom_argument, interactive, print_live_output), amount_of_attempts, delay_in_seconds=delay_in_seconds)
+
+
     # Return-values program_runner: Pid
     @GeneralUtilities.check_arguments
     def run_program_argsasarray_async(self, program: str, arguments_as_array: list[str] = [], working_directory: str = None,  print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, custom_argument: object = None, interactive: bool = False) -> int:

ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py

@@ -13,7 +13,6 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
     def __init__(self,current_file:str,verbosity:LogLevel,targetenvironmenttype:str,use_cache:bool,is_pre_merge:bool):
         super().__init__(current_file, verbosity,targetenvironmenttype,use_cache,is_pre_merge)
 
-    
     @GeneralUtilities.check_arguments
     def build(self,platforms:list[Platform],custom_arguments:dict[str,str]) -> None:
         codeunitname: str =self.get_codeunit_name()
@@ -44,7 +43,7 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
             args.append(f"type=docker,dest={target_file}")
             args.append(".")
             time.sleep(5)
-            self._protected_sc.run_program_argsasarray("docker", args, codeunit_folder, print_errors_as_information=True,print_live_output=self.get_verbosity()==LogLevel.Debug)
+            self._protected_sc.run_program_argsasarray_with_retry("docker", args, codeunit_folder, print_errors_as_information=True,print_live_output=self.get_verbosity()==LogLevel.Debug,amount_of_attempts=3,delay_in_seconds=5)
             time.sleep(2)
             self._protected_sc.run_program_argsasarray("docker", ["load", "-i", target_file], codeunit_folder, print_errors_as_information=True,print_live_output=self.get_verbosity()==LogLevel.Debug)
 

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1562,4 +1562,4 @@ class TFCPS_Tools_General:
 
 
     def update_dependent_oci_images(self,repo:str):
-        pass#TODO update all image-tags in repo/.ScriptCollection/OCIImages/ImageDefinition.csv if possible using the custom defined registries in ~/.ScriptCollection if possible.
+        self.oci_image_manager.update_default_tag_for_images_in_image_definitions_file(repo,True)

{scriptcollection-4.2.78.dist-info → scriptcollection-4.2.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 4.2.78
+Version: 4.2.79
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -22,7 +22,7 @@ Classifier: Topic :: Terminals
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: build>=1.4.3
+Requires-Dist: build>=1.5.0
 Requires-Dist: coverage>=7.13.5
 Requires-Dist: cyclonedx-bom>=7.1.0
 Requires-Dist: defusedxml>=0.7.1
@@ -32,7 +32,7 @@ Requires-Dist: lxml>=6.0.1
 Requires-Dist: ntplib>=0.4.0
 Requires-Dist: Pillow>=11.3.0
 Requires-Dist: psutil>=7.2.2
-Requires-Dist: pycdlib>=1.14.0
+Requires-Dist: pycdlib>=1.16.0
 Requires-Dist: Pygments>=2.20.0
 Requires-Dist: pylint>=4.0.5
 Requires-Dist: pyOpenSSL>=25.3.0

{scriptcollection-4.2.78.dist-info → scriptcollection-4.2.79.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ScriptCollection/AnionBuildPlatform.py,sha256=K-PHarX802A0PU8uRu0GNcEZiXujFoXHACe-X9YJsAQ,11711
 ScriptCollection/CertificateUpdater.py,sha256=Pa6eyjQSx7IIvj4PQVMI0IwMs01KQrNSB7Qa-7lRfBs,9375
-ScriptCollection/Executables.py,sha256=Y1nzSLWjU7wQxh7BR8RKQM51pauhIeXJawC6SM5uWcw,44229
-ScriptCollection/GeneralUtilities.py,sha256=3Fgp0fAXF-rfcohy6k1RsRcMXEVRF15fHl8QJnViKIg,65497
+ScriptCollection/Executables.py,sha256=RXEm_fbfO4VuPj-OS0YbRgbUHYL4Xr4PD599kaXINBA,44783
+ScriptCollection/GeneralUtilities.py,sha256=JYcsEad4LA_kdlUVECk21wX8MtOv4AeIbD95_Hco2hk,65522
 ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
 ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
 ScriptCollection/ProgramRunnerBase.py,sha256=4A2eQgSg_rRgQcgSi-LYtUlM-uSQEpS7qFWn0tWt4uo,2171
@@ -9,15 +9,17 @@ 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=fvpJovrlNqW5EcN6NaZH7o5984PM2meD-BsrJjR0Er8,187128
+ScriptCollection/ScriptCollectionCore.py,sha256=a3Y6jKYzMqc33-AaG-MP0erF0kDnYCdCY7fJkP1GX3M,188192
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=83qDMILwxhH9DbC0sb358Vu8PXEysmJJyap_6gECZqs,1627
-ScriptCollection/OCIImages/OCIImageManager.py,sha256=aBogkSXNDyi8NO11N-s03nuFJEv7PyJ-wjHuYYeZfvs,6662
+ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
+ScriptCollection/OCIImages/OCIImageManager.py,sha256=awAFVkPifuySPjZ0NGiXeZidAo0D4qoMaHSGFAruq0s,10655
 ScriptCollection/OCIImages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebian.py,sha256=LADIRYDBguPtQ0z9HW6FkvPDQggd68I3w13ahN0DN1c,607
-ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebianSlim.py,sha256=tW3bfazpSoR-oP5PneCkKRTkNKt1b0N7l_Fk5cgbvJk,611
-ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGeneric.py,sha256=xyE4wYK6s17NrBJiat1ohMKlTjygC402QIUwvFNf0ao,604
-ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGenericV.py,sha256=T5vMwIDFEpm6JzSJVS2oRnc2Z7QbPWonld0LEUpHoMg,605
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebian.py,sha256=vHWrw_uMflgEleCyh-1cvBQ5mjYZ4gkiVj7r8KcowhA,774
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerDebianSlim.py,sha256=opzuFLK3tsLcHVm4F5z1mSGl7JHcv7Lz-bvasXRh6eU,768
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGeneric.py,sha256=NgFasra24O-9h_Eoh-25g_nS9d14QNEiySKz6S_6Ul4,765
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGenericV.py,sha256=BdrBuvZVqAh1-FnDAk7c4XEvjpaRbkrSeNZNoRjGK1o,756
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGitlabCE.py,sha256=9MKsoaygz39UEdum0CTTixUt3FM0CY4AQtjays5lWms,780
+ScriptCollection/OCIImages/ConcreteImageHandlers/ImageHandlerGitlabEE.py,sha256=158aIO7O2CX_QtO4ONHwQnPzFmkN-UQ4FmccKcTUFb4,770
 ScriptCollection/OCIImages/ConcreteImageHandlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/Resources/CultureChooser/CultureChooser.js,sha256=5-4pwGDq5j1UnpTZy850ZMoxlM9tYPeu781QpZBtCWM,951
 ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcBEtz2gJXmmM14OwTSFtFVRvw,276
@@ -30,9 +32,9 @@ ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=Tpzgiz6m3-cYCkObZOG5Uu7oM-EMoWFzz
 ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=-Ev9D3bZDlUk2WFQhcmvzQ3FCS97OdsVUd0koAdmpZc,7474
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=Ajfy2pLajTuU6UpwItHt4C2a-gLF3gPc4z6BktL3Cio,22163
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=VbS3qdpCc4ZgbwlwxHdLB_ras8dDmJDBklRrWIrhbDQ,101356
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=ydRDpWmU-smCphGyTNuaQeiabWaWOUgzIVtuPRoia1s,101274
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=bHBIaZuV1DqvBI5BGG8xp5PYDfDDGPlbcma8Z_0mCjc,12191
+ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=VtaLumyZaoj1jwY1kaym8qmLlzjWZ0jfsc2A1U_Lkpg,12237
 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
@@ -51,8 +53,10 @@ ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=9XK7XnbeOn
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=S_9g9IliQzBBqTQquYj6gI1E3OlGfGZsxXw-mSEe-iA,1690
 ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.78.dist-info/METADATA,sha256=wc5MdwqJz28QC9dQL-k7Mz-J9bv1OucsY0MKKgOAAog,7691
-scriptcollection-4.2.78.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.78.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.78.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.78.dist-info/RECORD,,
+ScriptCollection/__pycache__/GeneralUtilities.cpython-311.pyc,sha256=vy34znIhp2WBvpxj8Ooll30segB1194IUl_tYi-eO3w,110241
+ScriptCollection/__pycache__/__init__.cpython-311.pyc,sha256=eahP76xKGeVhw7p6P0oYe0ukpe_1L5fkFgXjMBuXPgQ,231
+scriptcollection-4.2.79.dist-info/METADATA,sha256=T7vUDpbYDlP15STaNUMCG5Bx8ZmhhvyO6kzNhDcVyrE,7691
+scriptcollection-4.2.79.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.79.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
+scriptcollection-4.2.79.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.79.dist-info/RECORD,,