From ed48b6a4bf9ebc70d8943b589f5375ab5fdb37cf Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 11 Aug 2023 11:16:07 +0200 Subject: [PATCH] RED-6725: Fixed wrong file encoding in container, that leads to not working rules on terms with special chars --- .../layoutparser-service-server/build.gradle.kts | 6 ++---- .../src/main/resources/Aptfile | 11 ----------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 layoutparser-service/layoutparser-service-server/src/main/resources/Aptfile diff --git a/layoutparser-service/layoutparser-service-server/build.gradle.kts b/layoutparser-service/layoutparser-service-server/build.gradle.kts index 6f69f5e..5cb7c69 100644 --- a/layoutparser-service/layoutparser-service-server/build.gradle.kts +++ b/layoutparser-service/layoutparser-service-server/build.gradle.kts @@ -71,10 +71,8 @@ sonarqube { tasks.named("bootBuildImage") { - println("--------------------" + layout.projectDirectory.file( "src/main/resources/Aptfile").toString()); - var aptfilePath = layout.projectDirectory.file( "src/main/resources/Aptfile").toString() // make sure this path is valid because there will be no log or exception if not - bindings.add("${aptfilePath}:/workspace/Aptfile:ro") - buildpacks.set(listOf("ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae", "urn:cnb:builder:paketo-buildpacks/java")) + environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") + environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8") imageName.set("nexus.knecon.com:5001/ff/${project.name}:${project.version}") if (project.hasProperty("buildbootDockerHostNetwork")) { diff --git a/layoutparser-service/layoutparser-service-server/src/main/resources/Aptfile b/layoutparser-service/layoutparser-service-server/src/main/resources/Aptfile deleted file mode 100644 index 0ff3ea4..0000000 --- a/layoutparser-service/layoutparser-service-server/src/main/resources/Aptfile +++ /dev/null @@ -1,11 +0,0 @@ -# you can list packages -ghostscript -cabextract -xfonts-utils -fonts-liberation - -# or include links to specific .deb files -http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb - -# or add custom apt repos (only required if using packages outside of the standard Ubuntu APT repositories) -# :repo:deb http://cz.archive.ubuntu.com/ubuntu artful main universe \ No newline at end of file