Compare commits

..

5 Commits

Author SHA1 Message Date
69e0f77830 Avoid multiple commands at the same for a stack 2023-11-26 17:29:53 +08:00
16cdaa8ed5 Enable back socket.io polling 2023-11-26 17:28:53 +08:00
5d33c474ec Downgrade from Node.js 20 to Node.js 18.17.1 2023-11-26 17:28:29 +08:00
7385d216a3 Fix 2023-11-25 22:26:12 +08:00
631bc60cb2 Add support for extra info: URLs (#182)
* Always show Down button

* Add URL and improve ArrayInput handling

* Minor
2023-11-25 22:14:21 +08:00
7 changed files with 20 additions and 34 deletions

View File

@ -195,7 +195,6 @@ export class DockgeServer {
// Create Socket.io // Create Socket.io
this.io = new socketIO.Server(this.httpServer, { this.io = new socketIO.Server(this.httpServer, {
cors, cors,
transports: [ "websocket" ],
}); });
this.io.on("connection", async (socket: Socket) => { this.io.on("connection", async (socket: Socket) => {

View File

@ -5,8 +5,6 @@ import { LimitQueue } from "./utils/limit-queue";
import { DockgeSocket } from "./util-server"; import { DockgeSocket } from "./util-server";
import { import {
allowedCommandList, allowedRawKeys, allowedCommandList, allowedRawKeys,
getComposeTerminalName,
getCryptoRandomInt,
PROGRESS_TERMINAL_ROWS, PROGRESS_TERMINAL_ROWS,
TERMINAL_COLS, TERMINAL_COLS,
TERMINAL_ROWS 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> { 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); return new Promise((resolve, reject) => {
terminal.rows = PROGRESS_TERMINAL_ROWS; // check if terminal exists
if (Terminal.terminalMap.has(terminalName)) {
reject("Another operation is already running, please try again later.");
return;
}
if (socket) { let terminal = new Terminal(server, terminalName, file, args, cwd);
terminal.join(socket); terminal.rows = PROGRESS_TERMINAL_ROWS;
}
if (socket) {
terminal.join(socket);
}
return new Promise((resolve) => {
terminal.onExit((exitCode : number) => { terminal.onExit((exitCode : number) => {
resolve(exitCode); resolve(exitCode);
}); });

View File

@ -1,4 +1,4 @@
FROM node:20-bookworm-slim FROM node:18.17.1-bookworm-slim
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" ENV PATH="$PNPM_HOME:$PATH"
@ -24,16 +24,3 @@ RUN apt update && apt install --yes --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& npm install pnpm -g \ && npm install pnpm -g \
&& pnpm install -g tsx && 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

View File

@ -97,5 +97,6 @@
"Cannot connect to the socket server.": "Cannot connect to the socket server.", "Cannot connect to the socket server.": "Cannot connect to the socket server.",
"reconnecting...": "Reconnecting...", "reconnecting...": "Reconnecting...",
"connecting...": "Connecting to the socket server...", "connecting...": "Connecting to the socket server...",
"url": "URL | URLs" "url": "URL | URLs",
"extra": "Extra"
} }

View File

@ -109,7 +109,7 @@ export default defineComponent({
}, 1500); }, 1500);
socket = io(url, { socket = io(url, {
transports: [ "websocket" ] transports: [ "websocket", "polling" ]
}); });
socket.on("connect", () => { socket.on("connect", () => {

View File

@ -87,14 +87,6 @@
<input id="name" v-model="stack.name" type="text" class="form-control" required @blur="stackNameToLowercase"> <input id="name" v-model="stack.name" type="text" class="form-control" required @blur="stackNameToLowercase">
<div class="form-text">{{ $t("Lowercase only") }}</div> <div class="form-text">{{ $t("Lowercase only") }}</div>
</div> </div>
<!-- URLs -->
<div class="mb-4">
<label class="form-label">
{{ $tc("url", 2) }}
</label>
<ArrayInput name="urls" :display-name="$t('url')" placeholder="https://" object-type="x-dockge" />
</div>
</div> </div>
</div> </div>
@ -128,7 +120,7 @@
<!-- General --> <!-- General -->
<div v-if="isEditMode"> <div v-if="isEditMode">
<h4 class="mb-3">{{ $t("Extra") }}</h4> <h4 class="mb-3">{{ $t("extra") }}</h4>
<div class="shadow-box big-padding mb-3"> <div class="shadow-box big-padding mb-3">
<!-- URLs --> <!-- URLs -->
<div class="mb-4"> <div class="mb-4">

View File

@ -2,6 +2,9 @@
"name": "dockge", "name": "dockge",
"version": "1.1.1", "version": "1.1.1",
"type": "module", "type": "module",
"engines": {
"node": ">= 18.0.0 && <= 18.17.1"
},
"scripts": { "scripts": {
"fmt": "eslint \"**/*.{ts,vue}\" --fix", "fmt": "eslint \"**/*.{ts,vue}\" --fix",
"lint": "eslint \"**/*.{ts,vue}\"", "lint": "eslint \"**/*.{ts,vue}\"",