mirror of
https://github.com/louislam/dockge.git
synced 2024-11-25 01:33:32 +01:00
Fix 100% cpu usage and terminal issue by downgrading Node.js to 18.17.1 (#186)
* Downgrade from Node.js 20 to Node.js 18.17.1 * Enable back socket.io polling * Avoid multiple commands at the same for a stack
This commit is contained in:
parent
0546f6a24e
commit
b5f6919bab
@ -195,7 +195,6 @@ export class DockgeServer {
|
||||
// Create Socket.io
|
||||
this.io = new socketIO.Server(this.httpServer, {
|
||||
cors,
|
||||
transports: [ "websocket" ],
|
||||
});
|
||||
|
||||
this.io.on("connection", async (socket: Socket) => {
|
||||
|
@ -5,8 +5,6 @@ import { LimitQueue } from "./utils/limit-queue";
|
||||
import { DockgeSocket } from "./util-server";
|
||||
import {
|
||||
allowedCommandList, allowedRawKeys,
|
||||
getComposeTerminalName,
|
||||
getCryptoRandomInt,
|
||||
PROGRESS_TERMINAL_ROWS,
|
||||
TERMINAL_COLS,
|
||||
TERMINAL_ROWS
|
||||
@ -207,14 +205,20 @@ export class Terminal {
|
||||
}
|
||||
|
||||
public static exec(server : DockgeServer, socket : DockgeSocket | undefined, terminalName : string, file : string, args : string | string[], cwd : string) : Promise<number> {
|
||||
const terminal = new Terminal(server, terminalName, file, args, cwd);
|
||||
terminal.rows = PROGRESS_TERMINAL_ROWS;
|
||||
return new Promise((resolve, reject) => {
|
||||
// check if terminal exists
|
||||
if (Terminal.terminalMap.has(terminalName)) {
|
||||
reject("Another operation is already running, please try again later.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (socket) {
|
||||
terminal.join(socket);
|
||||
}
|
||||
let terminal = new Terminal(server, terminalName, file, args, cwd);
|
||||
terminal.rows = PROGRESS_TERMINAL_ROWS;
|
||||
|
||||
if (socket) {
|
||||
terminal.join(socket);
|
||||
}
|
||||
|
||||
return new Promise((resolve) => {
|
||||
terminal.onExit((exitCode : number) => {
|
||||
resolve(exitCode);
|
||||
});
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM node:20-bookworm-slim
|
||||
FROM node:18.17.1-bookworm-slim
|
||||
ENV PNPM_HOME="/pnpm"
|
||||
ENV PATH="$PNPM_HOME:$PATH"
|
||||
|
||||
@ -24,16 +24,3 @@ RUN apt update && apt install --yes --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& npm install pnpm -g \
|
||||
&& pnpm install -g tsx
|
||||
|
||||
# ensures that /var/run/docker.sock exists
|
||||
# changes the ownership of /var/run/docker.sock
|
||||
RUN touch /var/run/docker.sock && chown node:node /var/run/docker.sock
|
||||
|
||||
# Full Base Image
|
||||
# MariaDB, Chromium and fonts
|
||||
#FROM base-slim AS base
|
||||
#ENV DOCKGE_ENABLE_EMBEDDED_MARIADB=1
|
||||
#RUN apt update && \
|
||||
# apt --yes --no-install-recommends install mariadb-server && \
|
||||
# rm -rf /var/lib/apt/lists/* && \
|
||||
# apt --yes autoremove
|
||||
|
@ -109,7 +109,7 @@ export default defineComponent({
|
||||
}, 1500);
|
||||
|
||||
socket = io(url, {
|
||||
transports: [ "websocket" ]
|
||||
transports: [ "websocket", "polling" ]
|
||||
});
|
||||
|
||||
socket.on("connect", () => {
|
||||
|
@ -2,6 +2,9 @@
|
||||
"name": "dockge",
|
||||
"version": "1.1.1",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">= 18.0.0 && <= 18.17.1"
|
||||
},
|
||||
"scripts": {
|
||||
"fmt": "eslint \"**/*.{ts,vue}\" --fix",
|
||||
"lint": "eslint \"**/*.{ts,vue}\"",
|
||||
|
Loading…
Reference in New Issue
Block a user