b36df3a40c
Fixed two critical bugs preventing ten-frames from rendering: 1. **Mastery mode not handled** (typstGenerator.ts:61) - Code only checked for 'smart' | 'manual' modes - Mastery mode fell into manual path, tried to use boolean flags that don't exist - Resulted in all display options being `undefined` - Fix: Check for both 'smart' OR 'mastery' modes (both use displayRules) 2. **Typst array membership syntax** (already fixed in previous commit) - Used `(i in array)` which doesn't work in Typst - Changed to `array.contains(i)` Added comprehensive unit tests (tenFrames.test.ts): - Problem analysis tests (regrouping detection) - Display rule evaluation tests - Full Typst template generation tests - Mastery mode specific tests - All 14 tests now passing Added debug logging to trace display rules resolution: - displayRules.ts: Shows rule evaluation per problem - typstGenerator.ts: Shows enriched problems and Typst data - Helps diagnose future issues The issue was that mastery mode (which uses displayRules like smart mode) was being treated as manual mode (which uses boolean flags), resulting in undefined display options. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
164 lines
5.4 KiB
Docker
164 lines
5.4 KiB
Docker
# Multi-stage build for Soroban Abacus Flashcards
|
|
FROM node:18-alpine AS base
|
|
|
|
# Install Python and build tools for better-sqlite3
|
|
RUN apk add --no-cache python3 py3-setuptools make g++
|
|
|
|
# Install pnpm and turbo
|
|
RUN npm install -g pnpm@9.15.4 turbo@1.10.0
|
|
|
|
WORKDIR /app
|
|
|
|
# Copy package files for dependency resolution
|
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml turbo.json ./
|
|
COPY apps/web/package.json ./apps/web/
|
|
COPY packages/core/client/node/package.json ./packages/core/client/node/
|
|
COPY packages/abacus-react/package.json ./packages/abacus-react/
|
|
COPY packages/templates/package.json ./packages/templates/
|
|
|
|
# Install ALL dependencies for build stage
|
|
RUN pnpm install --frozen-lockfile
|
|
|
|
# Builder stage
|
|
FROM base AS builder
|
|
|
|
# Accept git information as build arguments
|
|
ARG GIT_COMMIT
|
|
ARG GIT_COMMIT_SHORT
|
|
ARG GIT_BRANCH
|
|
ARG GIT_TAG
|
|
ARG GIT_DIRTY
|
|
|
|
# Set as environment variables for build scripts
|
|
ENV GIT_COMMIT=${GIT_COMMIT}
|
|
ENV GIT_COMMIT_SHORT=${GIT_COMMIT_SHORT}
|
|
ENV GIT_BRANCH=${GIT_BRANCH}
|
|
ENV GIT_TAG=${GIT_TAG}
|
|
ENV GIT_DIRTY=${GIT_DIRTY}
|
|
|
|
COPY . .
|
|
|
|
# Generate Panda CSS styled-system before building
|
|
RUN cd apps/web && npx @pandacss/dev
|
|
|
|
# Build using turbo for apps/web and its dependencies
|
|
RUN turbo build --filter=@soroban/web
|
|
|
|
# Production dependencies stage - install only runtime dependencies
|
|
# IMPORTANT: Must use same base as runner stage for binary compatibility (better-sqlite3)
|
|
FROM node:18-slim AS deps
|
|
WORKDIR /app
|
|
|
|
# Install build tools temporarily for better-sqlite3 installation
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
python3 \
|
|
make \
|
|
g++ \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Install pnpm
|
|
RUN npm install -g pnpm@9.15.4
|
|
|
|
# Copy package files
|
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
|
COPY apps/web/package.json ./apps/web/
|
|
COPY packages/core/client/node/package.json ./packages/core/client/node/
|
|
COPY packages/abacus-react/package.json ./packages/abacus-react/
|
|
COPY packages/templates/package.json ./packages/templates/
|
|
|
|
# Install ONLY production dependencies
|
|
RUN pnpm install --frozen-lockfile --prod
|
|
|
|
# Typst builder stage - download and prepare typst binary
|
|
FROM node:18-slim AS typst-builder
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
wget \
|
|
xz-utils \
|
|
ca-certificates \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
RUN ARCH=$(uname -m) && \
|
|
if [ "$ARCH" = "x86_64" ]; then \
|
|
TYPST_ARCH="x86_64-unknown-linux-musl"; \
|
|
elif [ "$ARCH" = "aarch64" ]; then \
|
|
TYPST_ARCH="aarch64-unknown-linux-musl"; \
|
|
else \
|
|
echo "Unsupported architecture: $ARCH" && exit 1; \
|
|
fi && \
|
|
TYPST_VERSION="v0.13.0" && \
|
|
wget -q "https://github.com/typst/typst/releases/download/${TYPST_VERSION}/typst-${TYPST_ARCH}.tar.xz" && \
|
|
tar -xf "typst-${TYPST_ARCH}.tar.xz" && \
|
|
mv "typst-${TYPST_ARCH}/typst" /usr/local/bin/typst && \
|
|
chmod +x /usr/local/bin/typst
|
|
|
|
# Production image
|
|
FROM node:18-slim AS runner
|
|
WORKDIR /app
|
|
|
|
# Install ONLY runtime dependencies (no build tools)
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
python3 \
|
|
python3-pip \
|
|
qpdf \
|
|
ca-certificates \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Copy typst binary from typst-builder stage
|
|
COPY --from=typst-builder /usr/local/bin/typst /usr/local/bin/typst
|
|
|
|
# Create non-root user
|
|
RUN addgroup --system --gid 1001 nodejs && \
|
|
adduser --system --uid 1001 nextjs
|
|
|
|
# Copy built Next.js application
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/.next ./apps/web/.next
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public
|
|
|
|
# Copy blog content (markdown files)
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/content ./apps/web/content
|
|
|
|
# Copy Panda CSS generated styles
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/styled-system ./apps/web/styled-system
|
|
|
|
# Copy server files (compiled from TypeScript)
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/server.js ./apps/web/
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/dist ./apps/web/dist
|
|
|
|
# Copy database migrations
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/drizzle ./apps/web/drizzle
|
|
|
|
# Copy PRODUCTION node_modules only (no dev dependencies)
|
|
COPY --from=deps --chown=nextjs:nodejs /app/node_modules ./node_modules
|
|
COPY --from=deps --chown=nextjs:nodejs /app/apps/web/node_modules ./apps/web/node_modules
|
|
|
|
# Copy core package (needed for Python flashcard generation scripts)
|
|
COPY --from=builder --chown=nextjs:nodejs /app/packages/core ./packages/core
|
|
|
|
# Copy templates package (needed for Typst templates)
|
|
COPY --from=builder --chown=nextjs:nodejs /app/packages/templates ./packages/templates
|
|
|
|
# Copy abacus-react package (needed for calendar generation scripts)
|
|
COPY --from=builder --chown=nextjs:nodejs /app/packages/abacus-react ./packages/abacus-react
|
|
|
|
# Install Python dependencies for flashcard generation
|
|
RUN pip3 install --no-cache-dir --break-system-packages -r packages/core/requirements.txt
|
|
|
|
# Copy package.json files for module resolution
|
|
COPY --from=builder --chown=nextjs:nodejs /app/package.json ./
|
|
COPY --from=builder --chown=nextjs:nodejs /app/apps/web/package.json ./apps/web/
|
|
|
|
# Set up environment
|
|
WORKDIR /app/apps/web
|
|
|
|
# Create data directory for SQLite database and uploads
|
|
RUN mkdir -p data/uploads && chown -R nextjs:nodejs data
|
|
|
|
USER nextjs
|
|
EXPOSE 3000
|
|
ENV PORT 3000
|
|
ENV HOSTNAME "0.0.0.0"
|
|
ENV NODE_ENV production
|
|
|
|
# Start the application
|
|
CMD ["node", "server.js"]
|