diff --git a/app/(customer)/dashboard/(admin)/agents/page.tsx b/app/(customer)/dashboard/(admin)/agents/page.tsx index 26825a99..0464ba00 100644 --- a/app/(customer)/dashboard/(admin)/agents/page.tsx +++ b/app/(customer)/dashboard/(admin)/agents/page.tsx @@ -6,6 +6,7 @@ import Link from "next/link"; import { Page, PageActions, PageContent, PageHeader, PageTitle } from "@/features/layout/page"; import { notFound } from "next/navigation"; import { db } from "@/db"; +export const dynamic = "force-dynamic"; export default async function RoutePage(props: PageParams<{}>) { const agents = await db.query.agent.findMany(); diff --git a/docker/dockerfile/Dockerfile b/docker/dockerfile/Dockerfile index 250cd52e..786ba6b0 100644 --- a/docker/dockerfile/Dockerfile +++ b/docker/dockerfile/Dockerfile @@ -1,11 +1,22 @@ -FROM node:23.5.0-alpine AS base +FROM node:23-alpine AS base ENV YARN_VERSION=4.9.1 -RUN apk add --no-cache libc6-compat -RUN apk add --no-cache openssl +RUN apk add --update --no-cache \ + build-base \ + libc6-compat \ + openssl \ + make \ + g++ \ + jpeg-dev \ + cairo-dev \ + giflib-dev \ + pango-dev \ + libtool \ + autoconf \ + automake \ + libpng -# install and use yarn 4.x RUN corepack enable && corepack prepare yarn@${YARN_VERSION} RUN yarn set version ${YARN_VERSION} @@ -18,6 +29,7 @@ COPY .yarn ./.yarn COPY .yarnrc.yml ./ COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./ + RUN \ if [ -f yarn.lock ]; then yarn; \ elif [ -f package-lock.json ]; then npm ci; \ @@ -48,10 +60,6 @@ COPY . . ENV NEXT_TELEMETRY_DISABLED=1 -RUN npx prisma generate -RUN npx zenstack generate - - RUN \ if [ -f yarn.lock ]; then yarn run build; \ elif [ -f package-lock.json ]; then npm run build; \ @@ -73,18 +81,16 @@ RUN adduser --system --uid 1001 nextjs COPY --from=builder /app/public ./public RUN mkdir .next -RUN mkdir -p /app/private/uploads -RUN chown -R nextjs:nodejs /app/private -RUN chown -R nextjs:nodejs /app/public - RUN chown nextjs:nodejs .next -COPY --from=builder /app/next.config.mjs ./ -COPY --from=builder /app/schema.zmodel ./ -COPY --from=builder /app/src/openapi.yaml ./src/ +COPY --from=builder /app/next.config.ts ./ +COPY --from=builder /app/drizzle.config.ts ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static -COPY --chown=nextjs:nodejs prisma ./prisma/ +COPY --chown=nextjs:nodejs src/db ./src/db + + + USER root @@ -100,3 +106,4 @@ ENV HOSTNAME="0.0.0.0" USER nextjs ENTRYPOINT ["sh","/app/app-prod-entrypoint.sh"] + diff --git a/package.json b/package.json index 83978075..4f450948 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "input-otp": "^1.4.2", "lucide-react": "^0.510.0", "minio": "^8.0.5", - "next": "^15.4.0-canary.36", + "next": "^15.4.2-canary.5", "next-safe-action": "^7.10.8", "next-themes": "^0.4.6", "nodemailer": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 7febf37d..80d44284 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1099,10 +1099,10 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:15.4.1": - version: 15.4.1 - resolution: "@next/env@npm:15.4.1" - checksum: 10c0/389c4c5d126c252a742d78336d0b8d99678a83cb003a2f80f805adc89fcb9e9f617a279c0db07ca94d8c7c94458f34992dd49fcdd10c5d00940c45ad5cf79fbd +"@next/env@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/env@npm:15.4.2-canary.5" + checksum: 10c0/c363dada1eec21cfdeef18e96cd63744a700dda53fa8c59b6643810af3e4a400d381e245ff8e173843e4a586f53a96e0ac8861bcdca02c079e06adf9db44a439 languageName: node linkType: hard @@ -1115,58 +1115,58 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-darwin-arm64@npm:15.4.1" +"@next/swc-darwin-arm64@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-darwin-arm64@npm:15.4.2-canary.5" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-darwin-x64@npm:15.4.1" +"@next/swc-darwin-x64@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-darwin-x64@npm:15.4.2-canary.5" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-linux-arm64-gnu@npm:15.4.1" +"@next/swc-linux-arm64-gnu@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-linux-arm64-gnu@npm:15.4.2-canary.5" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-linux-arm64-musl@npm:15.4.1" +"@next/swc-linux-arm64-musl@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-linux-arm64-musl@npm:15.4.2-canary.5" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-linux-x64-gnu@npm:15.4.1" +"@next/swc-linux-x64-gnu@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-linux-x64-gnu@npm:15.4.2-canary.5" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-linux-x64-musl@npm:15.4.1" +"@next/swc-linux-x64-musl@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-linux-x64-musl@npm:15.4.2-canary.5" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-win32-arm64-msvc@npm:15.4.1" +"@next/swc-win32-arm64-msvc@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-win32-arm64-msvc@npm:15.4.2-canary.5" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:15.4.1": - version: 15.4.1 - resolution: "@next/swc-win32-x64-msvc@npm:15.4.1" +"@next/swc-win32-x64-msvc@npm:15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "@next/swc-win32-x64-msvc@npm:15.4.2-canary.5" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -8102,19 +8102,19 @@ __metadata: languageName: node linkType: hard -"next@npm:^15.4.0-canary.36": - version: 15.4.1 - resolution: "next@npm:15.4.1" +"next@npm:^15.4.2-canary.5": + version: 15.4.2-canary.5 + resolution: "next@npm:15.4.2-canary.5" dependencies: - "@next/env": "npm:15.4.1" - "@next/swc-darwin-arm64": "npm:15.4.1" - "@next/swc-darwin-x64": "npm:15.4.1" - "@next/swc-linux-arm64-gnu": "npm:15.4.1" - "@next/swc-linux-arm64-musl": "npm:15.4.1" - "@next/swc-linux-x64-gnu": "npm:15.4.1" - "@next/swc-linux-x64-musl": "npm:15.4.1" - "@next/swc-win32-arm64-msvc": "npm:15.4.1" - "@next/swc-win32-x64-msvc": "npm:15.4.1" + "@next/env": "npm:15.4.2-canary.5" + "@next/swc-darwin-arm64": "npm:15.4.2-canary.5" + "@next/swc-darwin-x64": "npm:15.4.2-canary.5" + "@next/swc-linux-arm64-gnu": "npm:15.4.2-canary.5" + "@next/swc-linux-arm64-musl": "npm:15.4.2-canary.5" + "@next/swc-linux-x64-gnu": "npm:15.4.2-canary.5" + "@next/swc-linux-x64-musl": "npm:15.4.2-canary.5" + "@next/swc-win32-arm64-msvc": "npm:15.4.2-canary.5" + "@next/swc-win32-x64-msvc": "npm:15.4.2-canary.5" "@swc/helpers": "npm:0.5.15" caniuse-lite: "npm:^1.0.30001579" postcss: "npm:8.4.31" @@ -8157,7 +8157,7 @@ __metadata: optional: true bin: next: dist/bin/next - checksum: 10c0/5a3c6a5d411c21917457eb66be577def739d3237f95663eed94dbe8274b7cdee64a76c2b05ec792930c6488587b613d125413927d1d5202414b8d576e527f8e0 + checksum: 10c0/8d6113f95d866815ccb8927dcb9abf60a8abd8c8af6d7d20787a4f47b7b5efdc66d3de87d5046b77f0eced4e905dd83801282e4bc6c3b7e8326626dcc5ca3087 languageName: node linkType: hard @@ -8781,7 +8781,7 @@ __metadata: input-otp: "npm:^1.4.2" lucide-react: "npm:^0.510.0" minio: "npm:^8.0.5" - next: "npm:^15.4.0-canary.36" + next: "npm:^15.4.2-canary.5" next-safe-action: "npm:^7.10.8" next-themes: "npm:^0.4.6" nodemailer: "npm:^7.0.3"