Arnaud
002f14ced0
Shopping list add already worked generically for batch-cook recipes — no code needed there. New: mark a specific batch-cook dish as "cooked today", track its fridge expiry (cookingHistory.batchDishId), surface a "Leftovers expiring soon" widget on the pantry page, and send a daily push+email reminder via a new /api/internal/cron/leftover-reminders endpoint (mirrors the weekly-digest cron pattern; doesn't use the social notifications table, which requires a non-null actor and isn't built for self-reminders). Also fixes, from user-reported bugs: - Recipe cards showed no batch-cook badge/dish-count/prep-time in some views — added dishCount + prepMins/cookMins (now generated by the AI and persisted) to the card component and /recipes query. - Batch-cook descriptions occasionally contained raw markdown (**bold**) — added explicit "plain prose only" prompt instructions and a stripMarkdown() defensive fallback at render time. - Truncated/cut-off descriptions — the generateObject call had no maxOutputTokens set, so long structured responses could get cut off mid-field; now capped explicitly at 8000. - Generate dialogs (batch-cook + the main AI dialog) could show buttons unreachable once the progress bar appeared mid-generation — restructured so the action row is pinned outside the scrollable content area, not affected by content height changes. - /api/internal/* routes were being redirected to /login by middleware before their own CRON_SECRET check ever ran (pre-existing bug, affected the weekly-digest cron too) — added to PUBLIC_PATHS. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
71 lines
2.8 KiB
Docker
71 lines
2.8 KiB
Docker
# syntax=docker/dockerfile:1
|
|
FROM node:22-alpine AS base
|
|
RUN corepack enable
|
|
|
|
# ---- deps: install full workspace deps ----
|
|
FROM base AS deps
|
|
WORKDIR /repo
|
|
COPY pnpm-workspace.yaml package.json pnpm-lock.yaml ./
|
|
COPY apps/web/package.json apps/web/package.json
|
|
COPY packages/db/package.json packages/db/package.json
|
|
RUN pnpm install --frozen-lockfile
|
|
|
|
# ---- migrator: applies drizzle migrations + seeds tier definitions ----
|
|
FROM deps AS migrator
|
|
WORKDIR /repo/packages/db
|
|
COPY packages/db .
|
|
CMD ["sh", "-c", "pnpm migrate && pnpm seed"]
|
|
|
|
# ---- build ----
|
|
FROM base AS build
|
|
WORKDIR /repo
|
|
COPY --from=deps /repo/node_modules ./node_modules
|
|
COPY --from=deps /repo/apps/web/node_modules ./apps/web/node_modules
|
|
COPY --from=deps /repo/packages/db/node_modules ./packages/db/node_modules
|
|
COPY . .
|
|
# apps/web/.env.local is normally a symlink to repo-root .env.local (gitignored);
|
|
# it doesn't exist in the build context, so Next's env loader chokes on the dangling
|
|
# link. No secrets are needed at build time — they're injected at container runtime.
|
|
RUN rm -f apps/web/.env.local && touch apps/web/.env.local
|
|
ENV NEXT_TELEMETRY_DISABLED=1
|
|
# NEXT_PUBLIC_* vars are inlined into the client bundle at build time, not read at
|
|
# container runtime — must be passed as build args (compose.prod.yml wires these
|
|
# from the same stack env vars used at runtime, so they stay in sync).
|
|
ARG NEXT_PUBLIC_VAPID_PUBLIC_KEY
|
|
ARG NEXT_PUBLIC_GITHUB_ENABLED
|
|
ARG NEXT_PUBLIC_DISCORD_ENABLED
|
|
ARG NEXT_PUBLIC_AUTHENTIK_ENABLED
|
|
ENV NEXT_PUBLIC_VAPID_PUBLIC_KEY=$NEXT_PUBLIC_VAPID_PUBLIC_KEY
|
|
ENV NEXT_PUBLIC_GITHUB_ENABLED=$NEXT_PUBLIC_GITHUB_ENABLED
|
|
ENV NEXT_PUBLIC_DISCORD_ENABLED=$NEXT_PUBLIC_DISCORD_ENABLED
|
|
ENV NEXT_PUBLIC_AUTHENTIK_ENABLED=$NEXT_PUBLIC_AUTHENTIK_ENABLED
|
|
RUN pnpm --filter web build
|
|
|
|
# ---- runtime ----
|
|
FROM base AS runner
|
|
WORKDIR /app
|
|
ENV NODE_ENV=production
|
|
ENV NEXT_TELEMETRY_DISABLED=1
|
|
ENV PORT=3000
|
|
RUN addgroup -g 1001 -S nodejs && adduser -S nextjs -u 1001
|
|
|
|
COPY --from=build /repo/apps/web/public ./public
|
|
COPY --from=build --chown=nextjs:nodejs /repo/apps/web/.next/standalone ./
|
|
COPY --from=build --chown=nextjs:nodejs /repo/apps/web/.next/static ./apps/web/.next/static
|
|
|
|
USER nextjs
|
|
EXPOSE 3000
|
|
CMD ["node", "apps/web/server.js"]
|
|
|
|
# ---- cron: periodically triggers internal cron endpoints (e.g. weekly digest) ----
|
|
# Minimal alpine + busybox crond image — just curls the running `web` service on a
|
|
# schedule. Doesn't need the app build output at all, so it's based on `base`
|
|
# rather than `runner`, keeping the image tiny and independent of the Next build.
|
|
FROM base AS cron
|
|
RUN apk add --no-cache curl
|
|
COPY cron/crontab /etc/crontabs/root
|
|
COPY cron/run-digest.sh /usr/local/bin/run-digest.sh
|
|
COPY cron/run-leftover-reminders.sh /usr/local/bin/run-leftover-reminders.sh
|
|
RUN chmod +x /usr/local/bin/run-digest.sh /usr/local/bin/run-leftover-reminders.sh
|
|
CMD ["crond", "-f", "-l", "2"]
|