diff --git a/Dockerfile b/Dockerfile index f4be8c2..9e54215 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,8 @@ # # Source: https://github.com/dzhw/report-task # -FROM adoptopenjdk:15.0.2_7-jre-hotspot-focal +FROM eclipse-temurin:21-jre-jammy MAINTAINER René Reitmann -ARG JAR_FILE # install all available package updates RUN apt-get update && apt-get upgrade -y -q && apt-get dist-upgrade -y -q @@ -23,9 +22,16 @@ RUN apt-get update \ RUN mkdir /usr/share/texlive/texmf-dist/tex/latex/calibri COPY latex-packages/fonts/Calibri /usr/share/texlive/texmf-dist/ RUN echo "Map Calibri.map" >> /usr/share/texlive/texmf-dist/web2c/updmap.cfg -RUN fc-cache && texhash && mktexlsr && updmap-sys + +# copy memory limits config +COPY latex-packages/config/memory-limits.cnf /etc/texmf/texmf.d/ + +# update texlive +RUN fc-cache && update-texmf && texhash && mktexlsr && updmap-sys # copy other document assets COPY latex-packages/doc /app/doc + # COPY the spring boot task jar +ARG JAR_FILE COPY ${JAR_FILE} /app/report-task.jar diff --git a/latex-packages/config/memory-limits.cnf b/latex-packages/config/memory-limits.cnf new file mode 100644 index 0000000..0e028d0 --- /dev/null +++ b/latex-packages/config/memory-limits.cnf @@ -0,0 +1,7 @@ +main_memory = 12000000 +extra_mem_top = 12000000 +extra_mem_bot = 12000000 +font_mem_size = 12000000 +pool_size = 12000000 +buf_size = 12000000 +save_size = 12000000 \ No newline at end of file diff --git a/latex-packages/doc/Makefile b/latex-packages/doc/Makefile index e9cc74c..d675999 100644 --- a/latex-packages/doc/Makefile +++ b/latex-packages/doc/Makefile @@ -1,5 +1,6 @@ - filename=Main.tex +filename=Main.tex +# pdflatex is invoked twice to add page numbers to the table of content pdf: pdflatex -synctex=1 -interaction=errorstopmode -file-line-error -halt-on-error ${filename} pdflatex -synctex=1 -interaction=errorstopmode -file-line-error -halt-on-error ${filename} diff --git a/pom.xml.bak b/pom.xml.bak deleted file mode 100644 index fe3b58b..0000000 --- a/pom.xml.bak +++ /dev/null @@ -1,424 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.4.3 - - - - eu.dzhw.fdz.metadatamanagement.tasks - dataset-report-task - 1.0.107-SNAPSHOT - dataset-report-task - Spring Cloud Task which generates a Dataset Report for the MDM - - - 14 - 2.12.0 - ${project.build.directory}/test-results - Hoxton.SR1 - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - com.fasterxml.jackson.core - jackson-databind - - - com.github.spotbugs - spotbugs - 4.2.1 - provided - - - json - org.json - - - true - - - commons-io - commons-io - 2.8.0 - - - javax.validation - validation-api - - - org.hibernate.validator - hibernate-validator - - - - org.projectlombok - lombok - true - - - org.springframework - spring-web - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework.boot - spring-boot-loader-tools - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - test - - - hamcrest-core - org.hamcrest - - - - - org.springframework.cloud - spring-cloud-starter-task - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.github.spotbugs - spotbugs-maven-plugin - [3.1.12,) - - check - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - [3.11.0,) - - cpd-check - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - [1.6.0,) - - exec - - - - - - - - - - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - ${maven-sortpom-plugin.version} - - - verify - - sort - - - - - true - 4 - groupId,artifactId - groupId,artifactId - true - false - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.1.4 - - - spotbugs - compile - - check - - - - - Max - Low - true - - - - com.spotify - dockerfile-maven-plugin - 1.4.13 - - - build-docker-image - install - - build - - - - tag-docker-image-latest - install - - tag - - - latest-${project.activeProfiles[0].id} - - - - push-image-latest - - push - - - latest-${project.activeProfiles[0].id} - - - - - 347729458675.dkr.ecr.eu-central-1.amazonaws.com/dzhw/${project.artifactId} - ${project.version} - https://347729458675.dkr.ecr.eu-central-1.amazonaws.com - - target/${project.build.finalName}.jar - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - checkstyle - validate - - check - - - ${project.build.directory}/generated-test-sources/** - build/google_checks.xml - UTF-8 - true - true - true - 0 - false - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - - - You are running an older version of Maven. Our app - requires at least Maven 3.0 - [3.3.9,) - - - You are running an older version of Java. Our app - requires at least JDK ${java.version} - [${java.version}.0,) - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.14.0 - - - pmd check - validate - - check - cpd-check - - - - - false - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx2048m ${surefireArgLine} - - alphabetical - - **/*Tests.java - **/*Test.java - - - **/Abstract*.java - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 4.3.0 - - - javax.xml.bind - jaxb-api - 2.3.3 - - - - Github Actions - - ${project.testresult.directory}/coverage/jacoco/jacoco.xml - - - ${project.basedir} - - true - - - - org.jacoco - jacoco-maven-plugin - 0.8.6 - - - pre-unit-tests - - prepare-agent - - - - ${project.testresult.directory}/coverage/jacoco/jacoco.exec - - surefireArgLine - - **/builders/ - **/domain/Q*.* - **/org/** - - - - - - post-unit-test - test - - report - - - ${project.testresult.directory}/coverage/jacoco/jacoco.exec - ${project.testresult.directory}/coverage/jacoco - - **/builders/ - **/domain/Q*.* - **/org/** - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - dev - - true - - - - test - - - prod - - -