diff --git a/templates/_template/Dockerfile b/templates/_template/Dockerfile index 607f608d20e..12f8fb01d06 100644 --- a/templates/_template/Dockerfile +++ b/templates/_template/Dockerfile @@ -47,6 +47,7 @@ ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs +# Remove this line if you do not have this folder COPY --from=builder /app/public ./public # Set the correct permission for prerender cache diff --git a/templates/blank/Dockerfile b/templates/blank/Dockerfile index 607f608d20e..12f8fb01d06 100644 --- a/templates/blank/Dockerfile +++ b/templates/blank/Dockerfile @@ -47,6 +47,7 @@ ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs +# Remove this line if you do not have this folder COPY --from=builder /app/public ./public # Set the correct permission for prerender cache diff --git a/templates/with-payload-cloud/Dockerfile b/templates/with-payload-cloud/Dockerfile index 607f608d20e..12f8fb01d06 100644 --- a/templates/with-payload-cloud/Dockerfile +++ b/templates/with-payload-cloud/Dockerfile @@ -47,6 +47,7 @@ ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs +# Remove this line if you do not have this folder COPY --from=builder /app/public ./public # Set the correct permission for prerender cache diff --git a/templates/with-vercel-mongodb/Dockerfile b/templates/with-vercel-mongodb/Dockerfile index 607f608d20e..12f8fb01d06 100644 --- a/templates/with-vercel-mongodb/Dockerfile +++ b/templates/with-vercel-mongodb/Dockerfile @@ -47,6 +47,7 @@ ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs +# Remove this line if you do not have this folder COPY --from=builder /app/public ./public # Set the correct permission for prerender cache diff --git a/templates/with-vercel-postgres/Dockerfile b/templates/with-vercel-postgres/Dockerfile index 607f608d20e..12f8fb01d06 100644 --- a/templates/with-vercel-postgres/Dockerfile +++ b/templates/with-vercel-postgres/Dockerfile @@ -47,6 +47,7 @@ ENV NODE_ENV production RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 nextjs +# Remove this line if you do not have this folder COPY --from=builder /app/public ./public # Set the correct permission for prerender cache diff --git a/templates/with-vercel-postgres/docker-compose.yml b/templates/with-vercel-postgres/docker-compose.yml index 3aba7cc7e2a..eac27ce09d2 100644 --- a/templates/with-vercel-postgres/docker-compose.yml +++ b/templates/with-vercel-postgres/docker-compose.yml @@ -1,43 +1,13 @@ version: '3' services: - payload: - image: node:18-alpine + postgres: + image: postgres ports: - - '3000:3000' - volumes: - - .:/home/node/app - - node_modules:/home/node/app/node_modules - working_dir: /home/node/app/ - command: sh -c "corepack enable && corepack prepare pnpm@latest --activate && pnpm install && pnpm dev" - depends_on: - - mongo - # - postgres + - '54320:5432' + environment: + POSTGRES_USER: postgres + POSTGRES_DB: payloadtests # THIS MUST MATCH YOUR DB NAME IN .env + POSTGRES_HOST_AUTH_METHOD: trust env_file: - .env - - # Ensure your DATABASE_URI uses 'mongo' as the hostname ie. mongodb://mongo/my-db-name - mongo: - image: mongo:latest - ports: - - '27017:27017' - command: - - --storageEngine=wiredTiger - volumes: - - data:/data/db - logging: - driver: none - - # Uncomment the following to use postgres - # postgres: - # restart: always - # image: postgres:latest - # volumes: - # - pgdata:/var/lib/postgresql/data - # ports: - # - "5432:5432" - -volumes: - data: - # pgdata: - node_modules: diff --git a/templates/with-vercel-website/Dockerfile b/templates/with-vercel-website/Dockerfile index e7a5ead45e9..12f8fb01d06 100644 --- a/templates/with-vercel-website/Dockerfile +++ b/templates/with-vercel-website/Dockerfile @@ -1,24 +1,70 @@ -FROM node:18.8-alpine as base +# From https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile -FROM base as builder +FROM node:18-alpine AS base -WORKDIR /home/node/app -COPY package*.json ./ +# Install dependencies only when needed +FROM base AS deps +# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. +RUN apk add --no-cache libc6-compat +WORKDIR /app +# Install dependencies based on the preferred package manager +COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./ +RUN \ + if [ -f yarn.lock ]; then yarn --frozen-lockfile; \ + elif [ -f package-lock.json ]; then npm ci; \ + elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \ + else echo "Lockfile not found." && exit 1; \ + fi + + +# Rebuild the source code only when needed +FROM base AS builder +WORKDIR /app +COPY --from=deps /app/node_modules ./node_modules COPY . . -RUN yarn install -RUN yarn build -FROM base as runtime +# Next.js collects completely anonymous telemetry data about general usage. +# Learn more here: https://nextjs.org/telemetry +# Uncomment the following line in case you want to disable telemetry during the build. +# ENV NEXT_TELEMETRY_DISABLED 1 + +RUN \ + if [ -f yarn.lock ]; then yarn run build; \ + elif [ -f package-lock.json ]; then npm run build; \ + elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \ + else echo "Lockfile not found." && exit 1; \ + fi + +# Production image, copy all the files and run next +FROM base AS runner +WORKDIR /app -ENV NODE_ENV=production +ENV NODE_ENV production +# Uncomment the following line in case you want to disable telemetry during runtime. +# ENV NEXT_TELEMETRY_DISABLED 1 -WORKDIR /home/node/app -COPY package*.json ./ -COPY yarn.lock ./ +RUN addgroup --system --gid 1001 nodejs +RUN adduser --system --uid 1001 nextjs -RUN yarn install --production +# Remove this line if you do not have this folder +COPY --from=builder /app/public ./public + +# Set the correct permission for prerender cache +RUN mkdir .next +RUN chown nextjs:nodejs .next + +# Automatically leverage output traces to reduce image size +# https://nextjs.org/docs/advanced-features/output-file-tracing +COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ +COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static + +USER nextjs EXPOSE 3000 -CMD ["node", "dist/server.js"] +ENV PORT 3000 + +# server.js is created by next build from the standalone output +# https://nextjs.org/docs/pages/api-reference/next-config-js/output +CMD HOSTNAME="0.0.0.0" node server.js