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

changed used debian version

parent f1f27d4f

Other/Resources/Dependencies/Debian/Version.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
13.1

Other/Scripts/UpdateDependencies.py

+12 −1
Original line number Diff line number Diff line 
from pathlib import Path

from ScriptCollection.GeneralUtilities import GeneralUtilities

from ScriptCollection.TFCPS.TFCPS_Generic import TFCPS_Generic_Functions, TFCPS_Generic_CLI

from ScriptCollection.ImageUpdater import ImageUpdaterHelper, ConcreteImageUpdaterForDebian



def update_debian_version():

    concreteImageUpdaterForDebian=ConcreteImageUpdaterForDebian()

    latest_debian_tag=concreteImageUpdaterForDebian.version_to_tag(ImageUpdaterHelper.get_latest_version(concreteImageUpdaterForDebian.get_all_available_versions("debian")))



    current_file = str(Path(__file__).absolute())

    repository_folder = GeneralUtilities.resolve_relative_path("../../..", current_file)

    debian_version_file: str = GeneralUtilities.resolve_relative_path("Other/Resources/Dependencies/Debian/Version.txt", repository_folder)

    GeneralUtilities.write_text_to_file(debian_version_file, latest_debian_tag)



def prepare_build_codeunits():

    t :TFCPS_Generic_Functions= TFCPS_Generic_CLI().parse(__file__)

    repository_folder = GeneralUtilities.resolve_relative_path( "../../..", str(Path(__file__).absolute()))

    t.tfcps_Tools_General.update_submodule(repository_folder,"tessdata_best")

    update_debian_version()





if __name__ == "__main__":

SimpleOCR/Other/Build/Build.py

+7 −0
Original line number Diff line number Diff line 
from pathlib import Path

from ScriptCollection.GeneralUtilities import GeneralUtilities

from ScriptCollection.ImageUpdater import ConcreteImageUpdaterForDebian

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





def build():

    tf:TFCPS_CodeUnitSpecific_Docker_Functions=TFCPS_CodeUnitSpecific_Docker_CLI.parse(__file__)

    concreteImageUpdaterForDebian=ConcreteImageUpdaterForDebian()

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

    debian_tag:str=concreteImageUpdaterForDebian.version_to_tag(debian_version)

    tf.build(None,{

        "debian":tf._protected_sc.default_fallback_docker_registry,

        "debianversion":debian_tag,

    })

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

SimpleOCR/SimpleOCR/Dockerfile

+4 −1
Original line number Diff line number Diff line 
ARG debianversion

ARG CodeUnitVersion

ARG image_debian

FROM ${image_debian}:stable-20251208-slim

FROM ${image_debian}:{debianversion}

LABEL version=${CodeUnitVersion}

ENV ISRUNNINGINCONTAINER="true"



RUN mkdir /Workspace && \