diff --git a/.dockerignore b/.dockerignore index 4a7d727f1..17c6f6ab3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,5 @@ dist Dockerfile compose **/node_modules +**/dist diff --git a/Dockerfile b/Dockerfile index 419f9b1a2..eaa133513 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,16 @@ -FROM golang:1.23 AS builder +FROM node:22 AS frontend-builder +WORKDIR /workdir +COPY . . +RUN npm ci +RUN npm run build + +FROM golang:1.23 AS backend-builder WORKDIR /workdir COPY go.mod go.sum ./ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download COPY . . +COPY --from=frontend-builder /workdir/apps/console/dist ./apps/console/dist RUN --mount=type=cache,target=/root/.cache/go-build \ make bin/probod @@ -16,6 +23,6 @@ RUN useradd -m probo && \ apt-get update && \ apt-get install -y ca-certificates && \ rm -rf /var/lib/apt/lists/* -COPY --from=builder /workdir/bin /usr/local/bin/ +COPY --from=backend-builder /workdir/bin /usr/local/bin/ USER probo ENTRYPOINT ["probod"]