From 4983217ee063ee3b04f72c4c9d85ff3c1abfb6b8 Mon Sep 17 00:00:00 2001 From: Jaakko Vanhala Date: Sun, 12 Apr 2026 11:20:06 +0300 Subject: [PATCH] korjailtu depon cacheja --- network-poc/Dockerfile.prod | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/network-poc/Dockerfile.prod b/network-poc/Dockerfile.prod index 87eb32e..00366d0 100644 --- a/network-poc/Dockerfile.prod +++ b/network-poc/Dockerfile.prod @@ -1,25 +1,31 @@ # syntax=docker/dockerfile:1 # --- Vaihe 1: Frontend (Astro) --- +# npm install cachetetaan, mutta lähdekoodi kopioidaan aina tuoreena FROM node:22-slim AS frontend WORKDIR /app/frontend COPY frontend/package.json frontend/package-lock.json* ./ 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 # --- Vaihe 2: Wasm (wasm-pack) --- +# Cargo registry cachetetaan mount-cachella, lähdekoodi kopioidaan tuoreena 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 curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh WORKDIR /app COPY Cargo.toml Cargo.lock* ./ COPY node/Cargo.toml node/Cargo.toml -COPY node/src node/src COPY hub/Cargo.toml hub/Cargo.toml COPY native-node/Cargo.toml native-node/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 +# Lähdekoodi omana kerroksena +COPY node/src node/src RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target \ 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 COPY Cargo.toml Cargo.lock* ./ COPY hub/Cargo.toml hub/Cargo.toml -COPY hub/src hub/src COPY node/Cargo.toml node/Cargo.toml COPY native-node/Cargo.toml native-node/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 +# Lähdekoodi omana kerroksena +COPY hub/src hub/src RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target \ 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/* 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 -# Wasm-paketti staattisena COPY --from=wasm-builder /app/wasm-pkg /app/frontend/dist/pkg WORKDIR /app