diff --git a/Dockerfile b/Dockerfile index 91677226..5eb93e6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Use the base image -FROM frooodle/stirling-pdf-base:version7 +FROM frooodle/stirling-pdf-base:version8 ARG VERSION_TAG diff --git a/Dockerfile-lite b/Dockerfile-lite index a22a18d7..4352aa52 100644 --- a/Dockerfile-lite +++ b/Dockerfile-lite @@ -2,11 +2,11 @@ FROM bellsoft/liberica-openjdk-debian:17 RUN apt-get update && \ apt-get install -y --no-install-recommends \ - libreoffice-core-nogui \ + libreoffice-core \ libreoffice-common \ - libreoffice-writer-nogui \ - libreoffice-calc-nogui \ - libreoffice-impress-nogui \ + libreoffice-writer \ + libreoffice-calc \ + libreoffice-impress \ unoconv && \ rm -rf /var/lib/apt/lists/* diff --git a/DockerfileBase b/DockerfileBase index e05c7042..c913635f 100644 --- a/DockerfileBase +++ b/DockerfileBase @@ -11,11 +11,11 @@ RUN apt-get update && \ # Doc conversion RUN apt-get update && \ apt-get install -y --no-install-recommends \ - libreoffice-core-nogui \ + libreoffice-core \ libreoffice-common \ - libreoffice-writer-nogui \ - libreoffice-calc-nogui \ - libreoffice-impress-nogui \ + libreoffice-writer \ + libreoffice-calc \ + libreoffice-impress \ python3-uno \ curl \ unoconv diff --git a/build.gradle b/build.gradle index 72a8266a..8ee1d9de 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,10 @@ launch4j { } dependencies { + //security updates + implementation 'ch.qos.logback:logback-classic:1.4.14' + implementation 'ch.qos.logback:logback-core:1.4.14' + implementation 'org.yaml:snakeyaml:2.1' implementation 'org.springframework.boot:spring-boot-starter-web:3.1.6' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.6' @@ -91,8 +95,8 @@ dependencies { implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1' implementation 'org.apache.pdfbox:pdfbox:2.0.29' implementation 'org.apache.pdfbox:xmpbox:2.0.29' - implementation 'org.bouncycastle:bcprov-jdk15on:1.70' - implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' + implementation 'org.bouncycastle:bcprov-jdk18on:1.77' + implementation 'org.bouncycastle:bcpkix-jdk18on:1.77' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-core' implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'