Merge branch 'main' of https://git.jonb.io/jblu/jonbio

Dockerfile

@@ -1,25 +1,21 @@
-FROM node:18-alpine AS base
+FROM node:22-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* ./
+COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* \node_modules ./
-RUN \
+RUN corepack enable
-  if [ -f yarn.lock ]; then yarn --immutable; \
+RUN if [ -f yarn.lock ]; then yarn; fi
-  elif [ -f package-lock.json ]; then npm ci; \
+RUN ls -la
-  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 --from=deps ./node_modules ./node_modules
 COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1

app/tag-data.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
+{"next-js":3,"tailwind":2,"guide":4,"feature":1,"yoyoyoy":1,"github":1,"writings":1,"book":1,"reflection":1,"markdown":1,"code":1,"features":1}
-{}
-=======
-{"github":1,"guide":3,"next-js":2,"tailwind":1,"writings":1,"book":1,"reflection":1}
->>>>>>> f16543e1d30ccacc510db3a25ca4d48dfa82ad9a