Update Dockerfile
Browse files- Dockerfile +7 -35
Dockerfile
CHANGED
|
@@ -1,52 +1,24 @@
|
|
| 1 |
-
#
|
| 2 |
-
FROM rust:1.84-slim-bookworm AS rust-builder
|
| 3 |
-
WORKDIR /app
|
| 4 |
-
|
| 5 |
-
# Install system dependencies for building
|
| 6 |
-
RUN apt-get update && apt-get install -y pkg-config libssl-dev
|
| 7 |
-
|
| 8 |
-
COPY Cargo.toml ./
|
| 9 |
-
# Create a dummy main to cache dependencies
|
| 10 |
-
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build --release
|
| 11 |
-
COPY src ./src
|
| 12 |
-
RUN touch src/main.rs && cargo build --release
|
| 13 |
|
| 14 |
# --- Stage 2: Frontend Builder ---
|
| 15 |
FROM node:20-slim AS frontend-builder
|
| 16 |
WORKDIR /app/frontend
|
|
|
|
| 17 |
COPY frontend/package*.json ./
|
| 18 |
RUN npm install
|
|
|
|
| 19 |
COPY frontend/ ./
|
|
|
|
| 20 |
RUN npm run build
|
| 21 |
|
| 22 |
-
# --- Stage 3: Final Runtime
|
| 23 |
FROM debian:bookworm-slim
|
| 24 |
-
|
| 25 |
-
curl xz-utils wget ca-certificates procps \
|
| 26 |
-
libssl3 libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
|
| 27 |
-
libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 \
|
| 28 |
-
libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
|
| 29 |
-
libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 \
|
| 30 |
-
libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 \
|
| 31 |
-
libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 \
|
| 32 |
-
libxrandr2 libxrender1 libxss1 libxtst6
|
| 33 |
-
|
| 34 |
-
RUN useradd -m -u 1000 user
|
| 35 |
-
USER user
|
| 36 |
-
ENV HOME=/home/user
|
| 37 |
-
WORKDIR /home/user
|
| 38 |
-
|
| 39 |
-
# Install Nix in single-user mode
|
| 40 |
-
RUN curl -L https://nixos.org/nix/install | sh -s -- --no-daemon
|
| 41 |
-
ENV PATH="/home/user/.nix-profile/bin:${PATH}"
|
| 42 |
-
ENV NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz
|
| 43 |
|
| 44 |
# Copy built assets
|
| 45 |
COPY --from=rust-builder /app/target/release/polymorphic-agent .
|
|
|
|
| 46 |
COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
|
| 47 |
|
| 48 |
-
# Create dynamic folders
|
| 49 |
-
RUN mkdir -p ./frontend/src/dynamic
|
| 50 |
-
|
| 51 |
EXPOSE 7860
|
| 52 |
CMD ["./polymorphic-agent"]
|
|
|
|
| 1 |
+
# ... (Rust Stage remains the same) ...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
|
| 3 |
# --- Stage 2: Frontend Builder ---
|
| 4 |
FROM node:20-slim AS frontend-builder
|
| 5 |
WORKDIR /app/frontend
|
| 6 |
+
# Copy package files first for caching
|
| 7 |
COPY frontend/package*.json ./
|
| 8 |
RUN npm install
|
| 9 |
+
# Copy the rest of the frontend files
|
| 10 |
COPY frontend/ ./
|
| 11 |
+
# This will now run 'vite build' without failing on type checks
|
| 12 |
RUN npm run build
|
| 13 |
|
| 14 |
+
# --- Stage 3: Final Runtime ---
|
| 15 |
FROM debian:bookworm-slim
|
| 16 |
+
# ... (Install dependencies and Nix as before) ...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
|
| 18 |
# Copy built assets
|
| 19 |
COPY --from=rust-builder /app/target/release/polymorphic-agent .
|
| 20 |
+
# Ensure the path matches where Axum looks for files
|
| 21 |
COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
|
| 22 |
|
|
|
|
|
|
|
|
|
|
| 23 |
EXPOSE 7860
|
| 24 |
CMD ["./polymorphic-agent"]
|