jjbrunton/Sauci
1
0 Fork 0
mirror of https://github.com/jjbrunton/Sauci.git synced 2026-11-02 02:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(admin): use npm workspace in Docker

Browse Source 
Align admin production and development images with the repository's committed npm workspace and lockfile. This ensures shared and Expo-linked dependencies are installed before the admin build runs.
This commit is contained in:
jjbrunton committed 2026-08-27 21:49:42 +01:00
1 parent 6df9442cd0
commit 7545289dd3
2 files changed
+8 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/admin/Dockerfile
+4 -11
View File
@@ -2,19 +2,12 @@ FROM node:20-bookworm-slim AS builder
WORKDIR /app WORKDIR /app
# Enable pnpm via corepack (allow non-matching packageManager) # Copy the npm workspace and install from its committed lockfile.
ENV COREPACK_ENABLE_STRICT=0
ENV PNPM_CONFIG_LINK_WORKSPACE_PACKAGES=true
RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
# Copy everything first (workspaces need full structure)
COPY . . COPY . .
RUN npm ci
# Install all dependencies
RUN pnpm install --no-frozen-lockfile
# Build shared package first # Build shared package first
RUN pnpm exec turbo run build --filter=@sauci/shared RUN npm run build -w @sauci/shared
# Build admin app with env vars # Build admin app with env vars
ARG VITE_SUPABASE_URL ARG VITE_SUPABASE_URL
@@ -41,7 +34,7 @@ ENV VITE_COUNCIL_ENABLED=$VITE_COUNCIL_ENABLED
ENV VITE_COUNCIL_GENERATOR_MODEL=$VITE_COUNCIL_GENERATOR_MODEL ENV VITE_COUNCIL_GENERATOR_MODEL=$VITE_COUNCIL_GENERATOR_MODEL
ENV VITE_COUNCIL_REVIEWER_MODEL=$VITE_COUNCIL_REVIEWER_MODEL ENV VITE_COUNCIL_REVIEWER_MODEL=$VITE_COUNCIL_REVIEWER_MODEL
RUN pnpm exec turbo run build --filter=@sauci/admin RUN npm run build -w @sauci/admin
FROM nginx:alpine FROM nginx:alpine
COPY --from=builder /app/apps/admin/dist /usr/share/nginx/html COPY --from=builder /app/apps/admin/dist /usr/share/nginx/html
apps/admin/Dockerfile.dev
+4 -23
View File
@@ -2,34 +2,15 @@ FROM node:20-bookworm-slim
WORKDIR /app WORKDIR /app
# Enable pnpm via corepack (allow non-matching packageManager) # Install the complete npm workspace from its committed lockfile.
ENV COREPACK_ENABLE_STRICT=0
ENV PNPM_CONFIG_LINK_WORKSPACE_PACKAGES=true
RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
# Copy root package files and workspace configs
COPY package*.json ./
COPY pnpm-workspace.yaml ./
COPY turbo.json ./
# Copy all workspace package.json files
COPY apps/admin/package.json ./apps/admin/
COPY apps/mobile/package.json ./apps/mobile/
COPY apps/supabase/package.json ./apps/supabase/
COPY apps/web/package.json ./apps/web/
COPY packages/shared/package.json ./packages/shared/
# Install all dependencies at root level (workspaces)
RUN pnpm install --no-frozen-lockfile
# Copy all source code
COPY . . COPY . .
RUN npm ci
# Build shared package # Build shared package
RUN pnpm exec turbo run build --filter=@sauci/shared RUN npm run build -w @sauci/shared
WORKDIR /app/apps/admin WORKDIR /app/apps/admin
EXPOSE 3001 EXPOSE 3001
CMD ["pnpm", "run", "dev"] CMD ["npm", "run", "dev"]