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

Added multi-arch-support.

parent 9e879830

.ScriptCollection/OCIImages/ImageDefinition.csv

0 → 100644
+7 −0
Original line number Diff line number Diff line 
ImageName;UpstreamRegistryAddress;DefaultTag

MariaDB;docker.io/library/mariadb;12.2.2

PostgreSQL;docker.io/library/postgres;17.7

nginx;docker.io/library/nginx;1.29.4

Adminer;docker.io/library/adminer;5.4.1

Debian;docker.io/library/debian;13.4-slim

Syft;docker.io/anchore/syft;v1.41.2
 
 No newline at end of file

Other/Reference/Technical/Diagrams/CodeUnits-Overview.svg

+1 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8'?>

<ns0:svg xmlns:ns0="http://www.w3.org/2000/svg" contentStyleType="text/css" data-diagram-type="DESCRIPTION" height="402px" preserveAspectRatio="none" style="width:1085px;height:402px;background:#FFFFFF;" version="1.1" viewBox="0 0 1085 402" width="1085px" zoomAndPan="magnify">

  <ns0:title>CodeUnits of SimpleOCR</ns0:title>

  <ns0:defs />

SimpleOCR/Other/Build/Build.py

+9 −10
Original line number Diff line number Diff line 
from pathlib import Path

from packaging.version import Version

from ScriptCollection.GeneralUtilities import GeneralUtilities

from ScriptCollection.ImageUpdater import ConcreteImageUpdaterForDebian

from ScriptCollection.GeneralUtilities import Platform

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



 

def build():

    platforms:list[Platform] = [

            Platform.Linux_AMD64,

            Platform.Linux_ARM64,

    ]

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

    debian_tag:str=GeneralUtilities.read_text_from_file_without_linebreak(GeneralUtilities.resolve_relative_path("../../../../Other/Resources/Dependencies/Debian/Version.txt",str(Path(__file__).absolute())))

    tf.build({

        "debianversion":debian_tag,

    },{

        "debian":tf._protected_sc.default_fallback_docker_registry,

    tf.build(platforms,{

        "image_debian":tf.tfcps_Tools_General.oci_image_manager.get_registry_address_for_image_with_default_tag(tf.get_repository_folder(),"Debian"),

    })

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

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





if __name__ == "__main__":

    build()

SimpleOCR/Other/OnBuildingFinished.py

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ from ScriptCollection.TFCPS.Docker.TFCPS_CodeUnitSpecific_Docker import TFCPS_Co 
def on_building_finished():

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

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

    tf._protected_sc.ensure_local_docker_network_does_not_exist("simpleocr_net")



if __name__ == "__main__":

    on_building_finished()

SimpleOCR/SimpleOCR/Dockerfile

+5 −5
Original line number Diff line number Diff line 
ARG debianversion

ARG CodeUnitVersion

ARG image_debian

FROM ${image_debian}:${debianversion}

FROM ${image_debian}

ARG CodeUnitVersion

ARG DotNetRuntime

LABEL version=${CodeUnitVersion}

ENV ISRUNNINGINCONTAINER="true"



#TODO make it possible to have an own apt-server for apt-packages to get rid of rate limits

RUN mkdir /Workspace && \

    mkdir /Workspace/Application && \

    mkdir /Workspace/Application/Backend && \
@@ -26,7 +26,7 @@ RUN wget https://packages.microsoft.com/config/debian/13/packages-microsoft-prod 


RUN rm -rf /var/lib/apt/lists/*



ADD Other/Resources/DependentCodeUnits/SimpleOCRService/BuildResult_DotNet_linux-x64 /Workspace/Application/Backend

ADD Other/Resources/DependentCodeUnits/SimpleOCRService/BuildResult_DotNet_${DotNetRuntime} /Workspace/Application/Backend

COPY Other/Resources/DevelopmentCertificate/SimpleOCRDevelopmentCertificate.crt /Workspace/Other/Certificates

COPY Other/Resources/DevelopmentCertificate/SimpleOCRDevelopmentCertificate.key /Workspace/Other/Certificates