Skip to content

Commit

Permalink
Fix Docker build and restore ubuntu 24.04 as base Docker image
Browse files Browse the repository at this point in the history
Ubuntu version changed on suspicion of Ghostscript 10, but that issue is resolved.
  • Loading branch information
jbarlow83 committed Dec 2, 2024
1 parent 9a07503 commit 7565d20
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7565d20

Please sign in to comment.