lanhu/web
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

更新 Dockerfile，修复 node-canvas 字体显示问题

Browse Source
This commit is contained in:
luorijun
2025-04-21 17:38:56 +08:00
parent 86fda0de77
commit 2b3f6768f0
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Dockerfile
View File

@@ -1,23 +1,18 @@
# 基础阶段：安装依赖和构建应用
FROM node:22.14-alpine AS base FROM node:22.14-alpine AS base
# 运行时依赖
# 配置 alpine 镜像源 & 安装依赖
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
RUN apk add cairo pango giflib libjpeg pixman RUN apk add cairo pango giflib ttf-dejavu
# 依赖缓存阶段 # 依赖缓存阶段
FROM base AS deps FROM base AS deps
WORKDIR /app WORKDIR /app
# 安装依赖 RUN apk add build-base g++ cairo-dev pango-dev giflib-dev
RUN apk add build-base g++ cairo-dev pango-dev giflib-dev
# 启用 pnpm & 配置镜像源
RUN corepack enable pnpm
RUN pnpm config set registry https://registry.npmmirror.com
COPY package.json pnpm-lock.yaml* ./ COPY package.json pnpm-lock.yaml* ./
RUN corepack enable pnpm
RUN pnpm config set registry https://registry.npmmirror.com
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile
# 构建阶段 # 构建阶段
@@ -25,12 +20,10 @@ FROM base AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY .. .
# 环境变量设置
ENV NEXT_TELEMETRY_DISABLED=1 ENV NEXT_TELEMETRY_DISABLED=1
# 构建应用
RUN corepack enable pnpm RUN corepack enable pnpm
RUN pnpm run build RUN pnpm run build
@@ -38,28 +31,21 @@ RUN pnpm run build
FROM base AS runner FROM base AS runner
WORKDIR /app WORKDIR /app
# 环境变量设置
ENV NODE_ENV=production ENV NODE_ENV=production
ENV NEXT_TELEMETRY_DISABLED=1 ENV NEXT_TELEMETRY_DISABLED=1
# 添加非 root 用户
RUN addgroup --system --gid 1001 nodejs RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs RUN adduser --system --uid 1001 nextjs
# 复制必要文件
COPY --from=builder /app/public ./public COPY --from=builder /app/public ./public
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
# 切换到非 root 用户
USER nextjs USER nextjs
# 暴露端口
EXPOSE 3000 EXPOSE 3000
# 设置环境变量
ENV PORT=3000 ENV PORT=3000
ENV HOSTNAME="0.0.0.0" ENV HOSTNAME="0.0.0.0"
# 启动命令
CMD ["node", "server.js"] CMD ["node", "server.js"]

3
src/app/(auth)/login/captcha.tsx
View File

@@ -2,7 +2,6 @@ import {useCallback, useEffect, useState} from 'react'
import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from '@/components/ui/dialog' import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from '@/components/ui/dialog'
import {Button} from '@/components/ui/button' import {Button} from '@/components/ui/button'
import {Input} from '@/components/ui/input' import {Input} from '@/components/ui/input'
import Image from 'next/image'
export type CaptchaProps = { export type CaptchaProps = {
showCaptcha: boolean showCaptcha: boolean
@@ -45,7 +44,7 @@ export default function Captcha(props: CaptchaProps) {
</DialogHeader> </DialogHeader>
<div className="space-y-4"> <div className="space-y-4">
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<Image <img
src={captchaImage} src={captchaImage}
alt="验证码" alt="验证码"
width={180} width={180}