admin/nexus-terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 兼容 armv7 docker 镜像构建

Browse Source
This commit is contained in:
Baobhan Sith
2025-05-02 20:53:04 +08:00
parent 4b2978346e
commit 2abc81dbc7
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/Dockerfile
+9 -6
View File
@@ -1,16 +1,18 @@
FROM node:20-alpine AS builder
FROM node:20 AS builder
WORKDIR /app
COPY package.json package-lock.json* ./
# Copy root package files including the lock file
COPY package.json package-lock.json ./
# Copy workspace package.json files to ensure npm ci works correctly in monorepo
COPY packages/backend/package.json ./packages/backend/
COPY packages/frontend/package.json ./packages/frontend/
COPY packages/rdp/package.json ./packages/rdp/
RUN npm ci
# Install dependencies (using install instead of ci for potential armv7/alpine compatibility issues)
RUN npm install
COPY packages/backend/src ./packages/backend/src
COPY packages/backend/tsconfig.json ./packages/backend/
@@ -21,7 +23,8 @@ RUN npm run build --workspace=@nexus-terminal/backend
FROM node:20-alpine
RUN apk add --no-cache --virtual .build-deps python3 make g++
# Install build dependencies including setuptools for node-gyp
RUN apk add --no-cache --virtual .build-deps python3 py3-setuptools make g++
WORKDIR /app
packages/frontend/Dockerfile
+8 -4
View File
@@ -1,14 +1,18 @@
FROM node:20-alpine AS builder
FROM node:20 AS builder
WORKDIR /app
COPY package.json package-lock.json* ./
# Copy root package files
COPY package.json package-lock.json ./
COPY packages/frontend/package.json ./packages/frontend/
# Copy workspace package.json files to ensure npm ci works correctly in monorepo
COPY packages/backend/package.json ./packages/backend/
COPY packages/frontend/package.json ./packages/frontend/
COPY packages/rdp/package.json ./packages/rdp/
RUN npm ci
# Install dependencies (using install instead of ci for potential armv7 compatibility issues)
RUN npm install
COPY packages/frontend/src ./packages/frontend/src
packages/frontend/package.json
+1 -1
View File
@@ -28,7 +28,7 @@
"vue3-recaptcha2": "^1.8.0",
"vuedraggable": "^4.1.0",
"xterm": "^5.3.0",
"xterm-addon-fit": "^0.8.0",
"@xterm/addon-fit": "^0.10.0",
"xterm-addon-web-links": "^0.9.0"
},
"devDependencies": {
packages/frontend/src/components/Terminal.vue
+1 -1
View File
@@ -4,7 +4,7 @@ import { Terminal, ITerminalAddon, IDisposable } from 'xterm';
import { useAppearanceStore } from '../stores/appearance.store';
import { useSettingsStore } from '../stores/settings.store';
import { storeToRefs } from 'pinia';
import { FitAddon } from 'xterm-addon-fit';
import { FitAddon } from '@xterm/addon-fit'; // Updated import path
import { WebLinksAddon } from 'xterm-addon-web-links';
import { SearchAddon, type ISearchOptions } from '@xterm/addon-search';
import 'xterm/css/xterm.css';