korjailtu depon cacheja

This commit is contained in:
Jaakko Vanhala
2026-04-12 11:20:06 +03:00
parent 27c33e41c3
commit 4983217ee0

View File

@@ -1,25 +1,31 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
# --- Vaihe 1: Frontend (Astro) --- # --- Vaihe 1: Frontend (Astro) ---
# npm install cachetetaan, mutta lähdekoodi kopioidaan aina tuoreena
FROM node:22-slim AS frontend FROM node:22-slim AS frontend
WORKDIR /app/frontend WORKDIR /app/frontend
COPY frontend/package.json frontend/package-lock.json* ./ COPY frontend/package.json frontend/package-lock.json* ./
RUN npm install --silent RUN npm install --silent
COPY frontend/ . # Lähdekoodi omana kerroksena — Docker invalidoi tämän kun mikä tahansa tiedosto muuttuu
COPY frontend/src frontend/src
COPY frontend/public frontend/public
COPY frontend/astro.config.mjs frontend/tsconfig.json ./
RUN npm run build RUN npm run build
# --- Vaihe 2: Wasm (wasm-pack) --- # --- Vaihe 2: Wasm (wasm-pack) ---
# Cargo registry cachetetaan mount-cachella, lähdekoodi kopioidaan tuoreena
FROM rust:slim AS wasm-builder FROM rust:slim AS wasm-builder
RUN apt-get update && apt-get install -y curl pkg-config libssl-dev g++ && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y curl pkg-config libssl-dev g++ && rm -rf /var/lib/apt/lists/*
RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
WORKDIR /app WORKDIR /app
COPY Cargo.toml Cargo.lock* ./ COPY Cargo.toml Cargo.lock* ./
COPY node/Cargo.toml node/Cargo.toml COPY node/Cargo.toml node/Cargo.toml
COPY node/src node/src
COPY hub/Cargo.toml hub/Cargo.toml COPY hub/Cargo.toml hub/Cargo.toml
COPY native-node/Cargo.toml native-node/Cargo.toml COPY native-node/Cargo.toml native-node/Cargo.toml
COPY cli/Cargo.toml cli/Cargo.toml COPY cli/Cargo.toml cli/Cargo.toml
RUN mkdir -p hub/src native-node/src cli/src && touch hub/src/main.rs native-node/src/main.rs cli/src/main.rs RUN mkdir -p hub/src native-node/src cli/src && touch hub/src/main.rs native-node/src/main.rs cli/src/main.rs
# Lähdekoodi omana kerroksena
COPY node/src node/src
RUN --mount=type=cache,target=/usr/local/cargo/registry \ RUN --mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/app/target \ --mount=type=cache,target=/app/target \
cd node && wasm-pack build --target web --out-dir /app/wasm-pkg cd node && wasm-pack build --target web --out-dir /app/wasm-pkg
@@ -30,11 +36,12 @@ RUN apt-get update && apt-get install -y pkg-config libssl-dev && rm -rf /var/li
WORKDIR /app WORKDIR /app
COPY Cargo.toml Cargo.lock* ./ COPY Cargo.toml Cargo.lock* ./
COPY hub/Cargo.toml hub/Cargo.toml COPY hub/Cargo.toml hub/Cargo.toml
COPY hub/src hub/src
COPY node/Cargo.toml node/Cargo.toml COPY node/Cargo.toml node/Cargo.toml
COPY native-node/Cargo.toml native-node/Cargo.toml COPY native-node/Cargo.toml native-node/Cargo.toml
COPY cli/Cargo.toml cli/Cargo.toml COPY cli/Cargo.toml cli/Cargo.toml
RUN mkdir -p node/src native-node/src cli/src && touch node/src/lib.rs native-node/src/main.rs cli/src/main.rs RUN mkdir -p node/src native-node/src cli/src && touch node/src/lib.rs native-node/src/main.rs cli/src/main.rs
# Lähdekoodi omana kerroksena
COPY hub/src hub/src
RUN --mount=type=cache,target=/usr/local/cargo/registry \ RUN --mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/app/target \ --mount=type=cache,target=/app/target \
cargo build --release -p hub \ cargo build --release -p hub \
@@ -45,9 +52,7 @@ FROM debian:bookworm-slim
RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
COPY --from=hub-builder /usr/local/bin/hub /usr/local/bin/hub COPY --from=hub-builder /usr/local/bin/hub /usr/local/bin/hub
# Astro dist sisältää kaiken: HTML, JS, avatars, templates, download, GUIDE.md
COPY --from=frontend /app/frontend/dist /app/frontend/dist COPY --from=frontend /app/frontend/dist /app/frontend/dist
# Wasm-paketti staattisena
COPY --from=wasm-builder /app/wasm-pkg /app/frontend/dist/pkg COPY --from=wasm-builder /app/wasm-pkg /app/frontend/dist/pkg
WORKDIR /app WORKDIR /app