From e44063da154fc6af690dcb3eaf7889b8c08bd719 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Sun, 9 Nov 2025 15:20:55 -0800 Subject: [PATCH] Update Dockerfile versions tesseract-ocr/alex-p does not have a Tesseract 5 for Ubuntu 25.10 so we use 25.04 for now. Ubuntu 25.04 gets us Ghostscript 10.05 which avoids issues in older versions. Remove comment about now-legacy Alpine versions not working properly. Alpine provides Ghostscript 10.05.1. Fixes #1587, --- .docker/Dockerfile | 4 ++-- .docker/Dockerfile.alpine | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 120309d0..3262616c 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2024 James R. Barlow # SPDX-License-Identifier: MPL-2.0 -FROM ubuntu:24.04 AS base +FROM ubuntu:25.04 AS base ENV LANG=C.UTF-8 ENV TZ=UTC @@ -40,7 +40,7 @@ RUN \ WORKDIR /app # Copy uv from ghcr -COPY --from=ghcr.io/astral-sh/uv:0.6.14 /uv /uvx /bin/ +COPY --from=ghcr.io/astral-sh/uv:0.9.8 /uv /uvx /bin/ ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine index 01b2db0c..297f0295 100644 --- a/.docker/Dockerfile.alpine +++ b/.docker/Dockerfile.alpine @@ -1,13 +1,7 @@ # SPDX-FileCopyrightText: 2023 James R. Barlow # SPDX-License-Identifier: MPL-2.0 -# Note: Alpine 3.20 builds tesseract with --enable-opencl, which is not -# supported by anyone. OCRmyPDF is not compatible with Alpine 3.20.0 -# through 3.20.3. The issue is fixed in 3.21. -# Details -# https://gitlab.alpinelinux.org/alpine/aports/-/issues/16143 -# https://github.com/ocrmypdf/OCRmyPDF/issues/1395 -FROM alpine:3.21 AS base +FROM alpine:3.22 AS base ENV LANG=C.UTF-8 ENV TZ=UTC @@ -28,7 +22,7 @@ RUN apk add --no-cache \ WORKDIR /app -COPY --from=ghcr.io/astral-sh/uv:0.6.14 /uv /uvx /bin/ +COPY --from=ghcr.io/astral-sh/uv:0.9.8 /uv /uvx /bin/ ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy