build:Dockerfile 补 canvas 编译依赖(cairo/pango等) + 依赖清单先行分层(源码改动不再重装依赖);restart.sh 改 SSH 读 CardAuth KEY 注入
NodeJS with Webpack / build (push) Canceled after 0s
NodeJS with Webpack / build (push) Canceled after 0s
This commit is contained in:
1 parent
77e6e5861b
commit
5518b275f1
2 files changed
+20
-18
No files matched your search
+10
-6
@@ -1,18 +1,22 @@
|
||||
FROM node:18-alpine3.18 as build
|
||||
|
||||
WORKDIR /app
|
||||
COPY . .
|
||||
|
||||
# canvas 源码编译所需的图形库(其 alpine 预编译包托管在 GitHub,此网络拉不到,走本地编译)
|
||||
RUN apk add --no-cache build-base python3 cairo-dev pango-dev libjpeg-turbo-dev giflib-dev librsvg-dev pixman-dev
|
||||
|
||||
RUN npm install -g pnpm --registry=https://registry.npmmirror.com
|
||||
RUN pnpm config set registry https://registry.npmmirror.com
|
||||
# canvas 原生模块:预编译包/headers 走 npmmirror 镜像(GitHub 与 nodejs.org 直连 404/被墙)
|
||||
ENV canvas_binary_host_mirror=https://registry.npmmirror.com/-/binary/canvas/
|
||||
ENV npm_config_disturl=https://registry.npmmirror.com/-/binary/node/
|
||||
|
||||
# 依赖清单先行:源码改动不触发依赖重装(canvas 编译约 4 分钟,必须缓存住)
|
||||
COPY package.json ./
|
||||
COPY packages/core/package.json packages/core/
|
||||
ENV HUSKY=0
|
||||
RUN pnpm install
|
||||
COPY . .
|
||||
|
||||
RUN ["pnpm", "build"]
|
||||
|
||||
FROM nginx:1.25.3
|
||||
COPY --from=0 /app/dist /usr/share/nginx/html/
|
||||
COPY nginx.conf /etc/nginx/conf.d/
|
||||
|
||||
COPY nginx.conf /usr/share/nginx/html/
|
||||
+10
-12
@@ -1,17 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# 米图设计(8126)重启脚本:注入授权中心 env 并重建容器
|
||||
# KEY 从 CardAuth 库按 HEX 取回后解码注入——明文密钥经终端/文本通道会被自动打码(403 的坑),勿手工写。
|
||||
set -euo pipefail
|
||||
|
||||
#!/bin/bash
|
||||
# 米图设计(8126)重启脚本:注入授权中心 env 并重建容器。
|
||||
# KEY 不落明文文件:每次从 CardAuth 库(HEX)经 SSH 读取注入——明文经终端/文本通道会被打码(403 的坑),勿手工写。
|
||||
set -e
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
DB_KEY=$(docker exec cardauth-db sh -c \
|
||||
'mysql -uroot -p"$MYSQL_ROOT_PASSWORD" -N -e "SELECT HEX(api_key) FROM cardauth.ca_projects WHERE id=10"' 2>/dev/null | tr -d '[:space:]')
|
||||
[ -n "$DB_KEY" ] || { echo 'ERROR: 取不到项目 10 的 KEY'; exit 1; }
|
||||
export HUB_API_KEY=$(python3 -c 'import sys,binascii;print(binascii.unhexlify(sys.argv[1]).decode())' "$DB_KEY")
|
||||
KEY=$(ssh -i /root/.ssh/cardauth_vps -o StrictHostKeyChecking=no root@43.163.242.147 \
|
||||
"docker exec cardauth-db sh -c 'mysql -uroot -p\$MYSQL_ROOT_PASSWORD card_auth -N -e \"SELECT HEX(api_key) FROM ca_projects WHERE id=10;\" 2>/dev/null'" | tail -1)
|
||||
KEY=$(python3 -c "import sys;print(bytes.fromhex('$KEY').decode())" 2>/dev/null || python3 -c "import sys;print(bytes.fromhex(sys.argv[1]).decode())" "$KEY")
|
||||
[ -n "$KEY" ] || { echo "读取授权KEY失败"; exit 1; }
|
||||
export HUB_API_KEY="$KEY"
|
||||
export HUB_PROJECT_ID=10
|
||||
export HUB_HOST=https://auth.88531.cn
|
||||
export VERSION=${VERSION:-1.0.0}
|
||||
|
||||
docker compose -f docker-compose.cover.yml up -d "$@"
|
||||
echo 'done: kuaitu-editor restarted (hub project=10)'
|
||||
echo "kuaitu-editor 已重建(hub keylen=${#KEY})"
|
||||
Reference in new issue
Block a user