Unverified Commit c7729cb7 authored by Marius Göcke's avatar Marius Göcke
Browse files

update

parent 7fb3b51c

SimpleOCR/Other/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ Resources/Constants/CodeUnitVersion.* 
Resources/Constants/CodeUnitMajorVersion.*

Resources/Constants/CommitDate.*

Resources/Constants/CommitId.*

Resources/Constants/CurrentTimestamp.*

Resources/DevelopmentCertificate

Resources/OCRData

SimpleOCR/Other/Build/Build.py

+3 −3
Original line number Diff line number Diff line 
from ScriptCollection.TFCPS.Docker.TFCPS_CodeUnitSpecific_Docker import TFCPS_CodeUnitSpecific_Docker_Functions,TFCPS_CodeUnitSpecific_Docker_CLI





def common_tasks():

def build():

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

    tf.build()

    tf.build(None)

    tf.tfcps_Tools_General.merge_sbom_file_from_dependent_codeunit_into_this(tf.get_codeunit_folder(),"SimpleOCR","SimpleOCRService",tf.use_cache())



if __name__ == "__main__":

    common_tasks()
 
    build()

SimpleOCR/Other/UpdateDependencies.py→SimpleOCR/Other/OnBuildingFinished.py

+5 −7
Original line number Diff line number Diff line 
import os

from ScriptCollection.GeneralUtilities import GeneralUtilities

from ScriptCollection.TFCPS.Docker.TFCPS_CodeUnitSpecific_Docker import TFCPS_CodeUnitSpecific_Docker_Functions,TFCPS_CodeUnitSpecific_Docker_CLI





def common_tasks():

def on_building_finished():

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

    tf.update_dependencies()



    tf.verify_image_is_working(None,None,443,"/API/Other/Maintenance/AvailabilityCheck",True)

 

if __name__ == "__main__":

    common_tasks()
 
    on_building_finished()

 
 No newline at end of file

SimpleOCR/SimpleOCR/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ ADD ./Other/Resources/OCRData /Workspace/OCRData 


WORKDIR /Workspace/Application

HEALTHCHECK CMD curl --insecure --fail https://localhost:443/API/Other/Maintenance/HealthCheck

ENTRYPOINT ["dotnet", "/Workspace/Application/SimpleOCRService.dll"]
 
#TODO pass commandline arguments

ENTRYPOINT ["dotnet", "/Workspace/Application/SimpleOCRService.dll", "--RealRun"]

SimpleOCRCLI/Other/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Resources/Constants/CodeUnitDescription.* 
Resources/Constants/CodeUnitMajorVersion.*

Resources/Constants/CommitDate.*

Resources/Constants/CommitId.*

Resources/Constants/CurrentTimestamp.*

Resources/CodeAnalysisResult/*.sarif

Resources/DevelopmentCertificate

Resources/OCRData