From ee79a305bad678d5cbf89a371f24488497d59b36 Mon Sep 17 00:00:00 2001 From: 9qeklajc Date: Sat, 30 May 2026 17:20:16 +0200 Subject: [PATCH] revert --- Dockerfile | 10 +++++----- Dockerfile.full | 13 +++++++------ compose.yml | 1 - 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42499d50..0494517f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim -WORKDIR /app - RUN apt-get update \ && apt-get install -y --no-install-recommends \ build-essential \ @@ -15,9 +13,11 @@ RUN apt-get update \ COPY uv.lock pyproject.toml ./ RUN mkdir -p /routstr -COPY . . +RUN uv sync --frozen --no-dev --no-install-project -RUN uv sync --frozen --no-dev +WORKDIR /app + +COPY . . ARG GIT_COMMIT="" ARG GIT_TAG="" @@ -28,4 +28,4 @@ ENV PYTHONUNBUFFERED=1 EXPOSE 8000 -CMD ["/app/.venv/bin/fastapi", "run", "routstr", "--host", "0.0.0.0"] +CMD ["/.venv/bin/fastapi", "run", "routstr", "--host", "0.0.0.0"] diff --git a/Dockerfile.full b/Dockerfile.full index a625f4ce..31e68d0a 100644 --- a/Dockerfile.full +++ b/Dockerfile.full @@ -18,8 +18,6 @@ RUN pnpm run build # Stage 2: Build the Routstr Node FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim AS runner -WORKDIR /app - RUN apt-get update \ && apt-get install -y --no-install-recommends \ build-essential \ @@ -30,10 +28,13 @@ RUN apt-get update \ libtool \ && rm -rf /var/lib/apt/lists/* -# Copy the rest of the application (required for uv sync to find the package) -COPY . . +COPY uv.lock pyproject.toml ./ -RUN uv sync --no-dev +RUN uv sync --no-dev --no-install-project + +WORKDIR /app + +COPY . . # Copy the built UI from the ui-builder stage COPY --from=ui-builder /app/ui/out ./ui_out @@ -48,4 +49,4 @@ ENV PYTHONUNBUFFERED=1 EXPOSE 8000 # Run the application -CMD ["/app/.venv/bin/fastapi", "run", "routstr", "--host", "0.0.0.0"] +CMD ["/.venv/bin/fastapi", "run", "routstr", "--host", "0.0.0.0"] diff --git a/compose.yml b/compose.yml index 0df234e2..e24e4a8f 100644 --- a/compose.yml +++ b/compose.yml @@ -20,7 +20,6 @@ services: - ui volumes: - .:/app:z - - /app/.venv - ./logs:/app/logs:z - tor-data:/var/lib/tor:ro - ./ui_out:/app/ui_out:ro,z