From 50f5f2f600709eb917db4eac287e0edf08ee1505 Mon Sep 17 00:00:00 2001 From: Aaron Yarborough Date: Sun, 6 Oct 2024 20:46:30 +0100 Subject: [PATCH] build: dockerfile --- .dockerignore | 7 +++++ Dockerfile | 68 +++++++++++++++++++++++++++++++++++++++++++ next.config.mjs | 2 +- package-lock.json | 6 ++-- package.json | 1 + public/sitemap-0.xml | 10 +++---- src/pages/cv/index.js | 2 +- 7 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..c550055 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +Dockerfile +.dockerignore +node_modules +npm-debug.log +README.md +.next +.git diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ead669b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,68 @@ +FROM node:18-alpine AS base + +# 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 . . + +# 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 +# Uncomment the following line in case you want to disable telemetry during runtime. +ENV NEXT_TELEMETRY_DISABLED=1s + +RUN addgroup --system --gid 1001 nodejs +RUN adduser --system --uid 1001 nextjs + +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 + +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 +ENV HOSTNAME="0.0.0.0" +CMD ["node", "server.js"] diff --git a/next.config.mjs b/next.config.mjs index aecfe96..c830d6e 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,7 +1,7 @@ /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, - output: 'export', + output: 'standalone', trailingSlash: true // ensure pages get their own directory in output } diff --git a/package-lock.json b/package-lock.json index ab5171d..9e558a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4643,9 +4643,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001667", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz", + "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index f482a6b..6ddd879 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dev": "next dev", "server": "npx decap-server", "build": "next build", + "docker:build": "docker build -t www-aaronjy-2024 .", "postbuild": "next-sitemap --config next-sitemap.config.cjs", "start": "next start", "link": "npx standard", diff --git a/public/sitemap-0.xml b/public/sitemap-0.xml index 5d4672c..75e20c5 100644 --- a/public/sitemap-0.xml +++ b/public/sitemap-0.xml @@ -1,8 +1,8 @@ -https://www.aaronjy.me/2024-08-24T08:38:49.863Zdaily0.7 -https://www.aaronjy.me/cv/2024-08-24T08:38:49.863Zdaily0.7 -https://www.aaronjy.me/writing/2024-08-24T08:38:49.863Zdaily0.7 -https://www.aaronjy.me/writing/static-site-on-google-cloud/2024-08-24T08:38:49.863Zdaily0.7 -https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/2024-08-24T08:38:49.863Zdaily0.7 +https://www.aaronjy.me/2024-10-06T19:40:04.941Zdaily0.7 +https://www.aaronjy.me/cv/2024-10-06T19:40:04.941Zdaily0.7 +https://www.aaronjy.me/writing/2024-10-06T19:40:04.941Zdaily0.7 +https://www.aaronjy.me/writing/static-site-on-google-cloud/2024-10-06T19:40:04.941Zdaily0.7 +https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/2024-10-06T19:40:04.941Zdaily0.7 \ No newline at end of file diff --git a/src/pages/cv/index.js b/src/pages/cv/index.js index a1deb3d..fc0e548 100644 --- a/src/pages/cv/index.js +++ b/src/pages/cv/index.js @@ -1,10 +1,10 @@ -import Cv from '@/components/Cv/Cv' import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout' import React from 'react' import yaml from 'js-yaml' import fs from 'fs' import showdown from 'showdown' import { NextSeo } from 'next-seo' +import Cv from '@/components/CV/CV' function CVPage ({ competencies,