chore: Refactor Dockerfiles to use build stages for improved caching and efficiency; update .dockerignore to exclude additional files; enhance pnpm workspace configuration for better package management.

.dockerignore

@@ -3,8 +3,12 @@
 data
 **/target
 **/node_modules
-apps/web/dist
-.turbo
+**/.turbo
+**/dist
+apps/api/test
+**/*.test.ts
+**/*.md
+**/.git*
 frontend
 *.db
 *.db-shm

.gitea/workflows/docker.yml

@@ -16,6 +16,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build test stage
         uses: docker/build-push-action@v5
         with:
@@ -24,6 +27,8 @@ jobs:
           load: true
           tags: cfdm:test
           provenance: false
+          cache-from: type=registry,ref=git.shts.su/${{ gitea.repository }}:testcache
+          cache-to: type=registry,ref=git.shts.su/${{ gitea.repository }}:testcache,mode=max
 
       - name: Run tests
         run: docker run --rm cfdm:test
@@ -72,9 +77,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: ./Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            NODE_VERSION=22.23.0-bookworm-slim
           cache-from: type=registry,ref=git.shts.su/${{ gitea.repository }}:buildcache
           cache-to: type=registry,ref=git.shts.su/${{ gitea.repository }}:buildcache,mode=max
           provenance: true

Dockerfile

@@ -1,44 +1,63 @@
 # syntax=docker/dockerfile:1
 
-FROM node:22-bookworm-slim AS builder
+ARG NODE_VERSION=22.23.0-bookworm-slim
+
+FROM node:${NODE_VERSION} AS deps
 WORKDIR /app
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3 \
-    make \
-    g++ \
-    && rm -rf /var/lib/apt/lists/*
-RUN corepack enable
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends python3 make g++ \
+  && rm -rf /var/lib/apt/lists/* \
+  && corepack enable
+
 COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
 COPY apps/web/package.json apps/web/
 COPY apps/api/package.json apps/api/
 COPY packages/ui/package.json packages/ui/
 COPY packages/shared/package.json packages/shared/
 COPY packages/db/package.json packages/db/
-RUN pnpm install --frozen-lockfile
-COPY apps apps
-COPY packages packages
-COPY turbo.json ./
-COPY VERSION VERSION
-RUN pnpm turbo build --filter=web --filter=@cfdm/api
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile
 
-FROM node:22-bookworm-slim AS runtime
-RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
+FROM node:${NODE_VERSION} AS build
 WORKDIR /app
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/apps/api/dist ./apps/api/dist
-COPY --from=builder /app/apps/api/package.json ./apps/api/package.json
-COPY --from=builder /app/packages/shared/dist ./packages/shared/dist
-COPY --from=builder /app/packages/shared/package.json ./packages/shared/package.json
-COPY --from=builder /app/packages/db/dist ./packages/db/dist
-COPY --from=builder /app/packages/db/package.json ./packages/db/package.json
-COPY --from=builder /app/packages/db/migrations ./packages/db/migrations
-COPY --from=builder /app/apps/web/dist ./static
-COPY VERSION ./VERSION
-ENV STATIC_DIR=/app/static
-ENV DATABASE_URL=sqlite:/data/app.db
-ENV SERVER_PORT=8080
+RUN corepack enable
+
+COPY --from=deps /app/node_modules ./node_modules
+COPY --from=deps /app/package.json --from=deps /app/pnpm-lock.yaml --from=deps /app/pnpm-workspace.yaml ./
+COPY --from=deps /app/apps/web/package.json ./apps/web/package.json
+COPY --from=deps /app/apps/api/package.json ./apps/api/package.json
+COPY --from=deps /app/packages/ui/package.json ./packages/ui/package.json
+COPY --from=deps /app/packages/shared/package.json ./packages/shared/package.json
+COPY --from=deps /app/packages/db/package.json ./packages/db/package.json
+
+COPY turbo.json ./
+COPY apps/web apps/web
+COPY apps/api apps/api
+COPY packages/ui packages/ui
+COPY packages/shared packages/shared
+COPY packages/db packages/db
+
+RUN pnpm turbo build --filter=web --filter=@cfdm/api \
+  && pnpm --filter @cfdm/api deploy --prod /out \
+  && cp -r apps/web/dist /out/static \
+  && find /out -type d \( -name src -o -name test -o -name .turbo -o -name scripts \) -exec rm -rf {} + \
+  && find /out -type f \( -name '*.d.ts' -o -name '*.map' -o -name 'tsconfig*.json' -o -name 'vitest.config.ts' -o -name 'drizzle.config.ts' -o -name 'README*' -o -name 'LICENSE*' -o -name 'CHANGELOG*' \) -delete
+
+FROM node:${NODE_VERSION}
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends ca-certificates \
+  && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+ENV NODE_ENV=production \
+    STATIC_DIR=/app/static \
+    DATABASE_URL=sqlite:/data/app.db \
+    SERVER_PORT=8080
+
+COPY --from=build /out ./
+
 EXPOSE 8080
 VOLUME ["/data"]
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-  CMD node -e "fetch('http://127.0.0.1:8080/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"
-CMD ["node", "apps/api/dist/server.js"]
+  CMD ["node", "-e", "fetch('http://127.0.0.1:8080/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
+CMD ["node", "dist/server.js"]

Dockerfile.test

@@ -1,22 +1,28 @@
 # syntax=docker/dockerfile:1
 
-FROM node:22-bookworm-slim AS test
+ARG NODE_VERSION=22.23.0-bookworm-slim
+
+FROM node:${NODE_VERSION} AS test
 WORKDIR /app
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3 \
-    make \
-    g++ \
-    && rm -rf /var/lib/apt/lists/*
-RUN corepack enable
-COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends python3 make g++ \
+  && rm -rf /var/lib/apt/lists/* \
+  && corepack enable
+
+COPY package.json pnpm-workspace.yaml pnpm-lock.yaml turbo.json ./
 COPY apps/web/package.json apps/web/
 COPY apps/api/package.json apps/api/
 COPY packages/ui/package.json packages/ui/
 COPY packages/shared/package.json packages/shared/
 COPY packages/db/package.json packages/db/
-RUN pnpm install --frozen-lockfile
-COPY apps apps
-COPY packages packages
-COPY turbo.json ./
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile
+
+COPY apps/web apps/web
+COPY apps/api apps/api
+COPY packages/ui packages/ui
+COPY packages/shared packages/shared
+COPY packages/db packages/db
+
 RUN pnpm turbo build --filter=@cfdm/shared --filter=@cfdm/db --filter=@cfdm/api
 CMD ["sh", "-c", "pnpm --filter @cfdm/api test && pnpm --filter web test"]

packages/db/package.json

@@ -3,6 +3,11 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
+  "files": [
+    "dist",
+    "migrations",
+    "package.json"
+  ],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

packages/shared/package.json

@@ -3,6 +3,10 @@
   "version": "0.0.0",
   "private": true,
   "type": "module",
+  "files": [
+    "dist",
+    "package.json"
+  ],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

pnpm-lock.yaml

@@ -3,6 +3,7 @@ lockfileVersion: '9.0'
 settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
+  injectWorkspacePackages: true
 
 importers:
 

pnpm-workspace.yaml

@@ -1,3 +1,5 @@
 packages:
   - "apps/*"
   - "packages/*"
+
+injectWorkspacePackages: true