From 7565d20c0a28a42accebc49e5f65c407ea3ddead Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Mon, 2 Dec 2024 11:36:26 -0800 Subject: [PATCH] Fix Docker build and restore ubuntu 24.04 as base Docker image Ubuntu version changed on suspicion of Ghostscript 10, but that issue is resolved. --- .docker/Dockerfile | 8 ++++---- .docker/Dockerfile.alpine | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 0e3ebe1d3..241aa2740 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:22.04 AS base +FROM ubuntu:24.04 AS base ENV LANG=C.UTF-8 ENV TZ=UTC @@ -40,12 +40,12 @@ COPY . /app WORKDIR /app -RUN curl -LsSf https://astral.sh/uv/0.5.4/install.sh | sh +# Copy uv from ghcr +COPY --from=ghcr.io/astral-sh/uv:0.5.5 /uv /uvx /bin/ ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy -# Instead of restarting the shell, use uv directly from its installed location. -RUN /root/.cargo/bin/uv sync --extra test --extra webservice --extra watcher +RUN uv sync --extra test --extra webservice --extra watcher FROM base diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine index d8b1dbe1c..72adc4610 100644 --- a/.docker/Dockerfile.alpine +++ b/.docker/Dockerfile.alpine @@ -29,12 +29,12 @@ COPY . /app WORKDIR /app -RUN curl -LsSf https://astral.sh/uv/0.5.4/install.sh | sh +COPY --from=ghcr.io/astral-sh/uv:0.5.5 /uv /uvx /bin/ ENV UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy # Instead of restarting the shell, use uv directly from its installed location. -RUN /root/.cargo/bin/uv sync --extra test --extra webservice --extra watcher +RUN uv sync --extra test --extra webservice --extra watcher FROM base