From 5975928e8985b91169c918c5b8b87dd960be2e50 Mon Sep 17 00:00:00 2001 From: Zoey Date: Wed, 22 May 2024 23:58:01 +0200 Subject: [PATCH 1/3] update to alpine v3.20.0 (1/2) --- Dockerfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 834dce6c..ade40ac0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Main stage -FROM alpine:20240329 +FROM alpine:3.20.0 # Copy necessary files COPY scripts /scripts @@ -10,35 +10,33 @@ COPY build/libs/*.jar app.jar ARG VERSION_TAG - # Set Environment Variables ENV DOCKER_ENABLE_SECURITY=false \ VERSION_TAG=$VERSION_TAG \ JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \ - HOME=/home/stirlingpdfuser \ - PUID=1000 \ + HOME=/home/stirlingpdfuser \ + PUID=1000 \ PGID=1000 \ UMASK=022 - # JDK for app RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ - apk update && \ + apk upgrade --no-cache -a && \ apk add --no-cache \ ca-certificates \ tzdata \ tini \ openssl \ -openssl-dev \ + openssl-dev \ bash \ curl \ openjdk21-jre \ su-exec \ shadow \ # Doc conversion - libreoffice@testing \ + libreoffice \ # pdftohtml poppler-utils \ # OCR MY PDF (unpaper for descew and other advanced featues) @@ -60,10 +58,9 @@ openssl-dev \ addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \ chown stirlingpdfuser:stirlingpdfgroup /app.jar && \ - tesseract --list-langs && \ - rm -rf /var/cache/apk/* + tesseract --list-langs -EXPOSE 8080 +EXPOSE 8080/tcp # Set user and run command ENTRYPOINT ["tini", "--", "/scripts/init.sh"] From 4d0135d7b763435a2dc6b187f89eb834cde36ef4 Mon Sep 17 00:00:00 2001 From: Zoey Date: Thu, 23 May 2024 00:02:55 +0200 Subject: [PATCH 2/3] update to alpine v3.20.0 (2/3) --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ade40ac0..6aab1d8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,13 +28,13 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et ca-certificates \ tzdata \ tini \ - openssl \ - openssl-dev \ bash \ curl \ - openjdk21-jre \ - su-exec \ shadow \ + su-exec \ + openssl \ + openssl-dev \ + openjdk21-jre \ # Doc conversion libreoffice \ # pdftohtml From 435bfa3b3fcac8739ea8396cc66f9d7179cb7f68 Mon Sep 17 00:00:00 2001 From: Zoey Date: Thu, 23 May 2024 00:03:00 +0200 Subject: [PATCH 3/3] update to alpine v3.20.0 (3/3) --- Dockerfile-ultra-lite | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Dockerfile-ultra-lite b/Dockerfile-ultra-lite index ea07e62f..e3718497 100644 --- a/Dockerfile-ultra-lite +++ b/Dockerfile-ultra-lite @@ -1,5 +1,5 @@ # use alpine -FROM alpine:3.19.1 +FROM alpine:3.20.0 ARG VERSION_TAG @@ -8,7 +8,7 @@ ENV DOCKER_ENABLE_SECURITY=false \ HOME=/home/stirlingpdfuser \ VERSION_TAG=$VERSION_TAG \ JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \ - PUID=1000 \ + PUID=1000 \ PGID=1000 \ UMASK=022 @@ -18,24 +18,23 @@ COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh COPY pipeline /pipeline COPY build/libs/*.jar app.jar - # Set up necessary directories and permissions - -RUN mkdir /configs /logs /customFiles && \ - chmod +x /scripts/*.sh && \ +RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ + echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ + echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ + apk upgrade --no-cache -a && \ apk add --no-cache \ ca-certificates \ tzdata \ tini \ bash \ curl \ - su-exec \ shadow \ + su-exec \ openjdk21-jre && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \ - echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \ # User permissions + mkdir /configs /logs /customFiles && \ + chmod +x /scripts/*.sh && \ addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \ chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /configs /customFiles /pipeline && \ chown stirlingpdfuser:stirlingpdfgroup /app.jar @@ -43,9 +42,8 @@ RUN mkdir /configs /logs /customFiles && \ # Set environment variables ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI -EXPOSE 8080 - -ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"] +EXPOSE 8080/tcp # Run the application +ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"] CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]