mirror of
https://github.com/louislam/dockge.git
synced 2025-08-12 14:07:02 +02:00
Compare commits
2 Commits
revert-303
...
fix-check-
Author | SHA1 | Date | |
---|---|---|---|
0aa4704b64 | |||
8fc23cc83e |
@ -6,7 +6,7 @@
|
||||
|
||||
A fancy, easy-to-use and reactive self-hosted docker compose.yaml stack-oriented manager.
|
||||
|
||||
   
|
||||
      
|
||||
|
||||
<img src="https://github.com/louislam/dockge/assets/1336778/26a583e1-ecb1-4a8d-aedf-76157d714ad7" width="900" alt="" />
|
||||
|
||||
|
3
backend/docker.ts
Normal file
3
backend/docker.ts
Normal file
@ -0,0 +1,3 @@
|
||||
export class Docker {
|
||||
|
||||
}
|
@ -194,39 +194,6 @@ export class DockgeServer {
|
||||
// Create Socket.io
|
||||
this.io = new socketIO.Server(this.httpServer, {
|
||||
cors,
|
||||
allowRequest: (req, callback) => {
|
||||
let isOriginValid = true;
|
||||
const bypass = isDev;
|
||||
|
||||
if (!bypass) {
|
||||
let host = req.headers.host;
|
||||
|
||||
// If this is set, it means the request is from the browser
|
||||
let origin = req.headers.origin;
|
||||
|
||||
// If this is from the browser, check if the origin is allowed
|
||||
if (origin) {
|
||||
try {
|
||||
let originURL = new URL(origin);
|
||||
|
||||
if (host !== originURL.host) {
|
||||
isOriginValid = false;
|
||||
log.error("auth", `Origin (${origin}) does not match host (${host}), IP: ${req.socket.remoteAddress}`);
|
||||
}
|
||||
} catch (e) {
|
||||
// Invalid origin url, probably not from browser
|
||||
isOriginValid = false;
|
||||
log.error("auth", `Invalid origin url (${origin}), IP: ${req.socket.remoteAddress}`);
|
||||
}
|
||||
} else {
|
||||
log.info("auth", `Origin is not set, IP: ${req.socket.remoteAddress}`);
|
||||
}
|
||||
} else {
|
||||
log.debug("auth", "Origin check is bypassed");
|
||||
}
|
||||
|
||||
callback(null, isOriginValid);
|
||||
}
|
||||
});
|
||||
|
||||
this.io.on("connection", async (socket: Socket) => {
|
||||
@ -611,35 +578,4 @@ export class DockgeServer {
|
||||
finalFunction() {
|
||||
log.info("server", "Graceful shutdown successful!");
|
||||
}
|
||||
|
||||
/**
|
||||
* Force connected sockets of a user to refresh and disconnect.
|
||||
* Used for resetting password.
|
||||
* @param {string} userID
|
||||
* @param {string?} currentSocketID
|
||||
*/
|
||||
disconnectAllSocketClients(userID: number, currentSocketID? : string) {
|
||||
for (const rawSocket of this.io.sockets.sockets.values()) {
|
||||
let socket = rawSocket as DockgeSocket;
|
||||
if (socket.userID === userID && socket.id !== currentSocketID) {
|
||||
try {
|
||||
socket.emit("refresh");
|
||||
socket.disconnect();
|
||||
} catch (e) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
isSSL() {
|
||||
return this.config.sslKey && this.config.sslCert;
|
||||
}
|
||||
|
||||
getLocalWebSocketURL() {
|
||||
const protocol = this.isSSL() ? "wss" : "ws";
|
||||
const host = this.config.hostname || "localhost";
|
||||
return `${protocol}://${host}:${this.config.port}`;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -211,8 +211,6 @@ export class MainSocketHandler extends SocketHandler {
|
||||
let user = await doubleCheckPassword(socket, password.currentPassword);
|
||||
await user.resetPassword(password.newPassword);
|
||||
|
||||
server.disconnectAllSocketClients(user.id, socket.id);
|
||||
|
||||
callback({
|
||||
ok: true,
|
||||
msg: "Password has been updated successfully.",
|
||||
@ -282,18 +280,6 @@ export class MainSocketHandler extends SocketHandler {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Disconnect all other socket clients of the user
|
||||
socket.on("disconnectOtherSocketClients", async () => {
|
||||
try {
|
||||
checkLogin(socket);
|
||||
server.disconnectAllSocketClients(socket.userID, socket.id);
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
log.warn("disconnectOtherSocketClients", e.message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async login(username : string, password : string) : Promise<User | null> {
|
||||
|
@ -162,44 +162,9 @@ export class TerminalSocketHandler extends SocketHandler {
|
||||
}
|
||||
});
|
||||
|
||||
// Resize Terminal
|
||||
socket.on(
|
||||
"terminalResize",
|
||||
async (terminalName: unknown, rows: unknown, cols: unknown) => {
|
||||
log.info("terminalResize", `Terminal: ${terminalName}`);
|
||||
try {
|
||||
checkLogin(socket);
|
||||
if (typeof terminalName !== "string") {
|
||||
throw new Error("Terminal name must be a string.");
|
||||
}
|
||||
// TODO: Resize Terminal
|
||||
socket.on("terminalResize", async (rows : unknown) => {
|
||||
|
||||
if (typeof rows !== "number") {
|
||||
throw new Error("Command must be a number.");
|
||||
}
|
||||
if (typeof cols !== "number") {
|
||||
throw new Error("Command must be a number.");
|
||||
}
|
||||
|
||||
let terminal = Terminal.getTerminal(terminalName);
|
||||
|
||||
// log.info("terminal", terminal);
|
||||
if (terminal instanceof Terminal) {
|
||||
//log.debug("terminalInput", "Terminal found, writing to terminal.");
|
||||
terminal.rows = rows;
|
||||
terminal.cols = cols;
|
||||
} else {
|
||||
throw new Error(`${terminalName} Terminal not found.`);
|
||||
}
|
||||
} catch (e) {
|
||||
log.debug(
|
||||
"terminalResize",
|
||||
// Added to prevent the lint error when adding the type
|
||||
// and ts type checker saying type is unknown.
|
||||
// @ts-ignore
|
||||
`Error on ${terminalName}: ${e.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -5,7 +5,6 @@ import yaml from "yaml";
|
||||
import { DockgeSocket, fileExists, ValidationError } from "./util-server";
|
||||
import path from "path";
|
||||
import {
|
||||
acceptedComposeFileNames,
|
||||
COMBINED_TERMINAL_COLS,
|
||||
COMBINED_TERMINAL_ROWS,
|
||||
CREATED_FILE,
|
||||
@ -41,7 +40,8 @@ export class Stack {
|
||||
|
||||
if (!skipFSOperations) {
|
||||
// Check if compose file name is different from compose.yaml
|
||||
for (const filename of acceptedComposeFileNames) {
|
||||
const supportedFileNames = [ "compose.yaml", "compose.yml", "docker-compose.yml", "docker-compose.yaml" ];
|
||||
for (const filename of supportedFileNames) {
|
||||
if (fs.existsSync(path.join(this.path, filename))) {
|
||||
this._composeFileName = filename;
|
||||
break;
|
||||
@ -222,26 +222,6 @@ export class Stack {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a compose file exists in the specified directory.
|
||||
* @async
|
||||
* @static
|
||||
* @param {string} stacksDir - The directory of the stack.
|
||||
* @param {string} filename - The name of the directory to check for the compose file.
|
||||
* @returns {Promise<boolean>} A promise that resolves to a boolean indicating whether any compose file exists.
|
||||
*/
|
||||
static async composeFileExists(stacksDir : string, filename : string) : Promise<boolean> {
|
||||
let filenamePath = path.join(stacksDir, filename);
|
||||
// Check if any compose file exists
|
||||
for (const filename of acceptedComposeFileNames) {
|
||||
let composeFile = path.join(filenamePath, filename);
|
||||
if (await fileExists(composeFile)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static async getStackList(server : DockgeServer, useCacheForManaged = false) : Promise<Map<string, Stack>> {
|
||||
let stacksDir = server.stacksDir;
|
||||
let stackList : Map<string, Stack>;
|
||||
@ -262,10 +242,6 @@ export class Stack {
|
||||
if (!stat.isDirectory()) {
|
||||
continue;
|
||||
}
|
||||
// If no compose file exists, skip it
|
||||
if (!await Stack.composeFileExists(stacksDir, filename)) {
|
||||
continue;
|
||||
}
|
||||
let stack = await this.getStack(server, filename);
|
||||
stack._status = CREATED_FILE;
|
||||
stackList.set(filename, stack);
|
||||
|
@ -67,7 +67,6 @@ export class Terminal {
|
||||
|
||||
set cols(cols : number) {
|
||||
this._cols = cols;
|
||||
log.debug("Terminal", `Terminal cols: ${this._cols}`); // Added to check if cols is being set when changing terminal size.
|
||||
try {
|
||||
this.ptyProcess?.resize(this.cols, this.rows);
|
||||
} catch (e) {
|
||||
|
@ -1,17 +1,13 @@
|
||||
/*
|
||||
* Common utilities for backend and frontend
|
||||
*/
|
||||
import yaml, { Document, Pair, Scalar } from "yaml";
|
||||
import { DotenvParseOutput } from "dotenv";
|
||||
import { Document } from "yaml";
|
||||
|
||||
// Init dayjs
|
||||
import dayjs from "dayjs";
|
||||
import timezone from "dayjs/plugin/timezone";
|
||||
import utc from "dayjs/plugin/utc";
|
||||
import relativeTime from "dayjs/plugin/relativeTime";
|
||||
// @ts-ignore
|
||||
import { replaceVariablesSync } from "@inventage/envsubst";
|
||||
|
||||
dayjs.extend(utc);
|
||||
dayjs.extend(timezone);
|
||||
dayjs.extend(relativeTime);
|
||||
@ -21,11 +17,6 @@ export interface LooseObject {
|
||||
[key: string]: any
|
||||
}
|
||||
|
||||
export interface BaseRes {
|
||||
ok: boolean;
|
||||
msg?: string;
|
||||
}
|
||||
|
||||
let randomBytes : (numBytes: number) => Uint8Array;
|
||||
initRandomBytes();
|
||||
|
||||
@ -116,13 +107,6 @@ export const allowedRawKeys = [
|
||||
"\u0003", // Ctrl + C
|
||||
];
|
||||
|
||||
export const acceptedComposeFileNames = [
|
||||
"compose.yaml",
|
||||
"docker-compose.yaml",
|
||||
"docker-compose.yml",
|
||||
"compose.yml",
|
||||
];
|
||||
|
||||
/**
|
||||
* Generate a decimal integer number from a string
|
||||
* @param str Input
|
||||
@ -356,52 +340,3 @@ export function parseDockerPort(input : string, defaultHostname : string = "loca
|
||||
display: display,
|
||||
};
|
||||
}
|
||||
|
||||
export function envsubst(string : string, variables : LooseObject) : string {
|
||||
return replaceVariablesSync(string, variables)[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Traverse all values in the yaml and for each value, if there are template variables, replace it environment variables
|
||||
* Emulates the behavior of how docker-compose handles environment variables in yaml files
|
||||
* @param content Yaml string
|
||||
* @param env Environment variables
|
||||
* @returns string Yaml string with environment variables replaced
|
||||
*/
|
||||
export function envsubstYAML(content : string, env : DotenvParseOutput) : string {
|
||||
const doc = yaml.parseDocument(content);
|
||||
if (doc.contents) {
|
||||
// @ts-ignore
|
||||
for (const item of doc.contents.items) {
|
||||
traverseYAML(item, env);
|
||||
}
|
||||
}
|
||||
return doc.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Used for envsubstYAML(...)
|
||||
* @param pair
|
||||
* @param env
|
||||
*/
|
||||
function traverseYAML(pair : Pair, env : DotenvParseOutput) : void {
|
||||
// @ts-ignore
|
||||
if (pair.value && pair.value.items) {
|
||||
// @ts-ignore
|
||||
for (const item of pair.value.items) {
|
||||
if (item instanceof Pair) {
|
||||
traverseYAML(item, env);
|
||||
} else if (item instanceof Scalar) {
|
||||
let value = item.value as unknown;
|
||||
|
||||
if (typeof(value) === "string") {
|
||||
item.value = envsubst(value, env);
|
||||
}
|
||||
}
|
||||
}
|
||||
// @ts-ignore
|
||||
} else if (pair.value && typeof(pair.value.value) === "string") {
|
||||
// @ts-ignore
|
||||
pair.value.value = envsubst(pair.value.value, env);
|
||||
}
|
||||
}
|
||||
|
@ -4,30 +4,16 @@ const input = `
|
||||
`;
|
||||
|
||||
const template = `
|
||||
|
||||
> [!WARNING]
|
||||
>
|
||||
|
||||
### 🆕 New Features
|
||||
-
|
||||
|
||||
### ⬆️ Improvements
|
||||
-
|
||||
### Improvements
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
-
|
||||
### 🐞 Bug Fixes
|
||||
|
||||
### 🦎 Translation Contributions
|
||||
-
|
||||
|
||||
### ⬆️ Security Fixes
|
||||
-
|
||||
|
||||
### Others
|
||||
- Other small changes, code refactoring and comment/doc updates in this repo:
|
||||
-
|
||||
|
||||
Please let me know if your username is missing, if your pull request has been merged in this version, or your commit has been included in one of the pull requests.
|
||||
`;
|
||||
|
||||
const lines = input.split("\n").filter((line) => line.trim() !== "");
|
||||
@ -51,12 +37,6 @@ for (const line of lines) {
|
||||
}
|
||||
|
||||
message = message.split("* ").pop();
|
||||
|
||||
let thanks = "";
|
||||
if (username != "@louislam") {
|
||||
thanks = `(Thanks ${username})`;
|
||||
}
|
||||
|
||||
console.log(pullRequestID, message, thanks);
|
||||
console.log("-", pullRequestID, message, `(Thanks ${username})`);
|
||||
}
|
||||
console.log(template);
|
||||
|
@ -4,8 +4,6 @@ import readline from "readline";
|
||||
import { User } from "../backend/models/user";
|
||||
import { DockgeServer } from "../backend/dockge-server";
|
||||
import { log } from "../backend/log";
|
||||
import { io } from "socket.io-client";
|
||||
import { BaseRes } from "../backend/util-common";
|
||||
|
||||
console.log("== Dockge Reset Password Tool ==");
|
||||
|
||||
@ -14,10 +12,11 @@ const rl = readline.createInterface({
|
||||
output: process.stdout
|
||||
});
|
||||
|
||||
const server = new DockgeServer();
|
||||
|
||||
export const main = async () => {
|
||||
const server = new DockgeServer();
|
||||
|
||||
// Check if
|
||||
|
||||
console.log("Connecting the database");
|
||||
try {
|
||||
await Database.init(server);
|
||||
@ -48,16 +47,12 @@ export const main = async () => {
|
||||
// Reset all sessions by reset jwt secret
|
||||
await server.initJWTSecret();
|
||||
|
||||
console.log("Password reset successfully.");
|
||||
|
||||
// Disconnect all other socket clients of the user
|
||||
await disconnectAllSocketClients(user.username, password);
|
||||
|
||||
break;
|
||||
} else {
|
||||
console.log("Passwords do not match, please try again.");
|
||||
}
|
||||
}
|
||||
console.log("Password reset successfully.");
|
||||
}
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
@ -84,47 +79,6 @@ function question(question : string) : Promise<string> {
|
||||
});
|
||||
}
|
||||
|
||||
function disconnectAllSocketClients(username : string, password : string) : Promise<void> {
|
||||
return new Promise((resolve) => {
|
||||
const url = server.getLocalWebSocketURL();
|
||||
|
||||
console.log("Connecting to " + url + " to disconnect all other socket clients");
|
||||
|
||||
// Disconnect all socket connections
|
||||
const socket = io(url, {
|
||||
transports: [ "websocket" ],
|
||||
reconnection: false,
|
||||
timeout: 5000,
|
||||
});
|
||||
socket.on("connect", () => {
|
||||
socket.emit("login", {
|
||||
username,
|
||||
password,
|
||||
}, (res : BaseRes) => {
|
||||
if (res.ok) {
|
||||
console.log("Logged in.");
|
||||
socket.emit("disconnectOtherSocketClients");
|
||||
} else {
|
||||
console.warn("Login failed.");
|
||||
console.warn("Please restart the server to disconnect all sessions.");
|
||||
}
|
||||
socket.close();
|
||||
});
|
||||
});
|
||||
|
||||
socket.on("connect_error", function () {
|
||||
// The localWebSocketURL is not guaranteed to be working for some complicated Uptime Kuma setup
|
||||
// Ask the user to restart the server manually
|
||||
console.warn("Failed to connect to " + url);
|
||||
console.warn("Please restart the server to disconnect all sessions manually.");
|
||||
resolve();
|
||||
});
|
||||
socket.on("disconnect", () => {
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
if (!process.env.TEST_BACKEND) {
|
||||
main();
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
<div v-if="!isEditMode">
|
||||
<span class="badge me-1" :class="bgStyle">{{ status }}</span>
|
||||
|
||||
<a v-for="port in envsubstService.ports" :key="port" :href="parsePort(port).url" target="_blank">
|
||||
<a v-for="port in service.ports" :key="port" :href="parsePort(port).url" target="_blank">
|
||||
<span class="badge me-1 bg-secondary">{{ parsePort(port).display }}</span>
|
||||
</a>
|
||||
</div>
|
||||
@ -213,29 +213,16 @@ export default defineComponent({
|
||||
jsonObject() {
|
||||
return this.$parent.$parent.jsonConfig;
|
||||
},
|
||||
|
||||
envsubstJSONConfig() {
|
||||
return this.$parent.$parent.envsubstJSONConfig;
|
||||
},
|
||||
|
||||
envsubstService() {
|
||||
if (!this.envsubstJSONConfig.services[this.name]) {
|
||||
return {};
|
||||
}
|
||||
return this.envsubstJSONConfig.services[this.name];
|
||||
},
|
||||
|
||||
imageName() {
|
||||
if (this.envsubstService.image) {
|
||||
return this.envsubstService.image.split(":")[0];
|
||||
if (this.service.image) {
|
||||
return this.service.image.split(":")[0];
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
},
|
||||
|
||||
imageTag() {
|
||||
if (this.envsubstService.image) {
|
||||
let tag = this.envsubstService.image.split(":")[1];
|
||||
if (this.service.image) {
|
||||
let tag = this.service.image.split(":")[1];
|
||||
|
||||
if (tag) {
|
||||
return tag;
|
||||
|
@ -5,8 +5,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Terminal } from "@xterm/xterm";
|
||||
import { FitAddon } from "@xterm/addon-fit";
|
||||
import { Terminal } from "xterm";
|
||||
import { WebLinksAddon } from "xterm-addon-web-links";
|
||||
import { TERMINAL_COLS, TERMINAL_ROWS } from "../../../backend/util-common";
|
||||
|
||||
@ -123,12 +122,10 @@ export default {
|
||||
}
|
||||
});
|
||||
}
|
||||
// Fit the terminal width to the div container size after terminal is created.
|
||||
this.updateTerminalSize();
|
||||
|
||||
},
|
||||
|
||||
unmounted() {
|
||||
window.removeEventListener("resize", this.onResizeEvent); // Remove the resize event listener from the window object.
|
||||
this.$root.unbindTerminal(this.name);
|
||||
this.terminal.dispose();
|
||||
},
|
||||
@ -211,30 +208,6 @@ export default {
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Update the terminal size to fit the container size.
|
||||
*
|
||||
* If the terminalFitAddOn is not created, creates it, loads it and then fits the terminal to the appropriate size.
|
||||
* It then addes an event listener to the window object to listen for resize events and calls the fit method of the terminalFitAddOn.
|
||||
*/
|
||||
updateTerminalSize() {
|
||||
if (!Object.hasOwn(this, "terminalFitAddOn")) {
|
||||
this.terminalFitAddOn = new FitAddon();
|
||||
this.terminal.loadAddon(this.terminalFitAddOn);
|
||||
window.addEventListener("resize", this.onResizeEvent);
|
||||
}
|
||||
this.terminalFitAddOn.fit();
|
||||
},
|
||||
/**
|
||||
* Handles the resize event of the terminal component.
|
||||
*/
|
||||
onResizeEvent() {
|
||||
this.terminalFitAddOn.fit();
|
||||
let rows = this.terminal.rows;
|
||||
let cols = this.terminal.cols;
|
||||
this.$root.getSocket().emit("terminalResize", this.name, rows, cols);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
@ -12,7 +12,7 @@
|
||||
"registry": "Регистър",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Създайте вашия първи стак!",
|
||||
"stackName": "Име на стак",
|
||||
"stackName" : "Име на стак",
|
||||
"deployStack": "Разположи",
|
||||
"deleteStack": "Изтрий",
|
||||
"stopStack": "Спри",
|
||||
@ -22,7 +22,7 @@
|
||||
"editStack": "Редактирай",
|
||||
"discardStack": "Отхвърли",
|
||||
"saveStackDraft": "Запази",
|
||||
"notAvailableShort": "N/A",
|
||||
"notAvailableShort" : "N/A",
|
||||
"deleteStackMsg": "Сигурни ли сте, че желаете да изтриете този стак?",
|
||||
"stackNotManagedByDockgeMsg": "Този стак не се управлява от Dockge.",
|
||||
"primaryHostname": "Основно име на хост",
|
||||
@ -90,13 +90,5 @@
|
||||
"Allowed commands:": "Позволени команди:",
|
||||
"Internal Networks": "Вътрешни мрежи",
|
||||
"External Networks": "Външни мрежи",
|
||||
"No External Networks": "Не са налични външни мрежи",
|
||||
"reverseProxyMsg2": "Проверете как да го конфигурирате за WebSocket",
|
||||
"downStack": "Спри и изключи",
|
||||
"reverseProxyMsg1": "Използвате ревърс прокси?",
|
||||
"Cannot connect to the socket server.": "Не може да се свърже със сокет сървъра.",
|
||||
"url": "URL адрес | URL адреси",
|
||||
"extra": "Допълнително",
|
||||
"reconnecting...": "Повторно свързване…",
|
||||
"connecting...": "Свързване със сокет сървъра…"
|
||||
"No External Networks": "Не са налични външни мрежи"
|
||||
}
|
||||
|
@ -3,39 +3,39 @@
|
||||
"Create your admin account": "Vytvořit účet administrátora",
|
||||
"authIncorrectCreds": "Nesprávné uživatelské jméno nebo heslo.",
|
||||
"PasswordsDoNotMatch": "Hesla se neshodují.",
|
||||
"Repeat Password": "Napište Heslo Znovu",
|
||||
"Repeat Password": "Opakujte heslo",
|
||||
"Create": "Vytvořit",
|
||||
"signedInDisp": "Přihlášen jako {0}",
|
||||
"signedInDispDisabled": "Ověření Zakázáno.",
|
||||
"signedInDispDisabled": "Ověření zakázáno.",
|
||||
"home": "Domů",
|
||||
"console": "Konzole",
|
||||
"registry": "Registry",
|
||||
"compose": "Komponovat",
|
||||
"addFirstStackMsg": "Vytvořte svůj první zásobník!",
|
||||
"stackName": "Název Zásobníku",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Vytvořte svůj první stack!",
|
||||
"stackName": "Název stacku",
|
||||
"deployStack": "Nainstalovat",
|
||||
"deleteStack": "Smazat",
|
||||
"stopStack": "Zastavit",
|
||||
"restartStack": "Restartovat",
|
||||
"updateStack": "Aktualizovat",
|
||||
"startStack": "Spustit",
|
||||
"downStack": "Zastavit & Vypnout",
|
||||
"downStack": "Zastavit a vypnout",
|
||||
"editStack": "Upravit",
|
||||
"discardStack": "Zahodit",
|
||||
"saveStackDraft": "Uložit",
|
||||
"notAvailableShort": "N/A",
|
||||
"deleteStackMsg": "Opravdu chcete smazat tento zásobník?",
|
||||
"deleteStackMsg": "Opravdu chcete smazat tento stack?",
|
||||
"stackNotManagedByDockgeMsg": "Tento stack není spravován systémem Dockge.",
|
||||
"primaryHostname": "Primární název hostitele",
|
||||
"general": "Obecné",
|
||||
"container": "Kontejner | Kontejnery",
|
||||
"scanFolder": "Prohledat složku se zásobníky",
|
||||
"scanFolder": "Prohledat složku se stacky",
|
||||
"dockerImage": "Obrázek",
|
||||
"restartPolicyUnlessStopped": "Pokud není zastaveno",
|
||||
"restartPolicyAlways": "Vždy",
|
||||
"restartPolicyOnFailure": "Při Selhání",
|
||||
"restartPolicyOnFailure": "Při selhání",
|
||||
"restartPolicyNo": "Ne",
|
||||
"environmentVariable": "Proměnná Prostředí | Proměnné Prostředí",
|
||||
"environmentVariable": "Proměnná prostředí | Proměnné prostředí",
|
||||
"restartPolicy": "Politika restartu",
|
||||
"containerName": "Název kontejneru",
|
||||
"port": "Port | Porty",
|
||||
@ -91,11 +91,5 @@
|
||||
"Allowed commands:": "Povolené příkazy:",
|
||||
"Internal Networks": "Interní sítě",
|
||||
"External Networks": "Externí sítě",
|
||||
"No External Networks": "Žádné externí sítě",
|
||||
"reconnecting...": "Opětovné připojení…",
|
||||
"url": "Adresa URL | Adresy URL",
|
||||
"extra": "Extra",
|
||||
"reverseProxyMsg1": "Používáte Reverzní proxy server?",
|
||||
"reverseProxyMsg2": "Podívat se jak to nastavit pro WebSocket",
|
||||
"Cannot connect to the socket server.": "Nelze se připojit k serveru ."
|
||||
"No External Networks": "Žádné externí sítě"
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
"home": "Startseite",
|
||||
"console": "Konsole",
|
||||
"registry": "Container Registry",
|
||||
"compose": "Compose",
|
||||
"compose": "",
|
||||
"addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
|
||||
"stackName": "Stack-Name",
|
||||
"deployStack": "Deployen",
|
||||
@ -72,15 +72,15 @@
|
||||
"Check Update On GitHub": "Update auf GitHub überprüfen",
|
||||
"Show update if available": "Update anzeigen, wenn verfügbar",
|
||||
"Also check beta release": "Auch Beta-Version überprüfen",
|
||||
"Remember me": "Angemeldet bleiben",
|
||||
"Remember me": "Anmeldung beibehalten",
|
||||
"Login": "Anmelden",
|
||||
"Username": "Benutzername",
|
||||
"Password": "Passwort",
|
||||
"Settings": "Einstellungen",
|
||||
"Logout": "Abmelden",
|
||||
"Lowercase only": "Nur Kleinbuchstaben",
|
||||
"Convert to Compose": "In Compose-Syntax umwandeln",
|
||||
"Docker Run": "Docker Run",
|
||||
"Convert to Compose": "In Compose Syntax umwandeln",
|
||||
"Docker Run": "Docker ausführen",
|
||||
"active": "aktiv",
|
||||
"exited": "beendet",
|
||||
"inactive": "inaktiv",
|
||||
|
@ -98,6 +98,5 @@
|
||||
"downStack": "Arrêter et désactiver",
|
||||
"reverseProxyMsg1": "Utilisez vous un proxy inverse ?",
|
||||
"Cannot connect to the socket server.": "Impossible de se connecter au serveur socket.",
|
||||
"reconnecting...": "Reconnexion…",
|
||||
"newUpdate": "Nouvelle mise à jour"
|
||||
"reconnecting...": "Reconnexion…"
|
||||
}
|
||||
|
@ -10,10 +10,10 @@
|
||||
"home": "Home",
|
||||
"console": "Console",
|
||||
"registry": "Registro",
|
||||
"compose": "Componi",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Componi il tuo primo stack!",
|
||||
"stackName": "Nome dello stack",
|
||||
"deployStack": "Rilascia",
|
||||
"deployStack": "Deploy",
|
||||
"deleteStack": "Cancella",
|
||||
"stopStack": "Stop",
|
||||
"restartStack": "Riavvia",
|
||||
@ -75,7 +75,7 @@
|
||||
"Also check beta release": "Controlla anche le release in beta",
|
||||
"Remember me": "Ricordami",
|
||||
"Login": "Login",
|
||||
"Username": "Nome Utente",
|
||||
"Username": "Username",
|
||||
"Password": "Password",
|
||||
"Settings": "Impostazioni",
|
||||
"Logout": "Logout",
|
||||
@ -97,6 +97,5 @@
|
||||
"Cannot connect to the socket server.": "Impossibile connettersi al server socket.",
|
||||
"connecting...": "Connessione al server socket…",
|
||||
"extra": "Extra",
|
||||
"reconnecting...": "Riconnessione…",
|
||||
"url": "Indirizzo | Indirizzi"
|
||||
"reconnecting...": "Riconnessione…"
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
"registry": "Registro",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Crie sua primeira stack!",
|
||||
"stackName": "Nome da stack",
|
||||
"stackName" : "Nome da stack",
|
||||
"deployStack": "Deploy",
|
||||
"deleteStack": "Excluir",
|
||||
"stopStack": "Parar",
|
||||
@ -22,7 +22,7 @@
|
||||
"editStack": "Editar",
|
||||
"discardStack": "Descartar",
|
||||
"saveStackDraft": "Salvar",
|
||||
"notAvailableShort": "N/D",
|
||||
"notAvailableShort" : "N/D",
|
||||
"deleteStackMsg": "Tem certeza que deseja excluir esta stack?",
|
||||
"stackNotManagedByDockgeMsg": "Esta stack não é gerenciada pelo Dockge.",
|
||||
"primaryHostname": "Nome do Host Primário",
|
||||
@ -90,13 +90,5 @@
|
||||
"Allowed commands:": "Comandos permitidos:",
|
||||
"Internal Networks": "Redes internas",
|
||||
"External Networks": "Redes externas",
|
||||
"No External Networks": "Sem redes externas",
|
||||
"reverseProxyMsg2": "Veja como configurar para WebSocket",
|
||||
"downStack": "Parar & Encerrar",
|
||||
"reverseProxyMsg1": "Utiliza proxy reverso?",
|
||||
"Cannot connect to the socket server.": "Não é possível conectar ao socket server.",
|
||||
"connecting...": "Conectando ao socket server…",
|
||||
"url": "URL | URLs",
|
||||
"extra": "Extra",
|
||||
"reconnecting...": "Reconectando…"
|
||||
"No External Networks": "Sem redes externas"
|
||||
}
|
||||
|
@ -5,12 +5,12 @@
|
||||
"PasswordsDoNotMatch": "Пароль не совпадает.",
|
||||
"Repeat Password": "Повторите пароль",
|
||||
"Create": "Создать",
|
||||
"signedInDisp": "Авторизован как {0}",
|
||||
"signedInDisp": "Авторизован как",
|
||||
"signedInDispDisabled": "Авторизация выключена.",
|
||||
"home": "Главная",
|
||||
"console": "Консоль",
|
||||
"registry": "Реестр (Registry)",
|
||||
"compose": "Составить (Compose)",
|
||||
"registry": "Registry",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Создайте свой первый стек!",
|
||||
"stackName": "Имя стека",
|
||||
"deployStack": "Развернуть",
|
||||
@ -90,13 +90,5 @@
|
||||
"Allowed commands:": "Разрешенные команды:",
|
||||
"Internal Networks": "Внутренние сети",
|
||||
"External Networks": "Внешние сети",
|
||||
"No External Networks": "Нет внешних сетей",
|
||||
"downStack": "Остановить и выключить",
|
||||
"reverseProxyMsg1": "Использовать Реверс Прокси?",
|
||||
"reconnecting...": "Переподключение…",
|
||||
"Cannot connect to the socket server.": "Не удается подключиться к серверу сокетов.",
|
||||
"url": "URL адрес(а)",
|
||||
"extra": "Дополнительно",
|
||||
"reverseProxyMsg2": "Проверьте, как настроить его для WebSocket",
|
||||
"connecting...": "Подключение к серверу сокетов…"
|
||||
"No External Networks": "Нет внешних сетей"
|
||||
}
|
||||
|
@ -90,10 +90,5 @@
|
||||
"Allowed commands:": "Dovoljeni ukazi:",
|
||||
"Internal Networks": "Notranja omrežja",
|
||||
"External Networks": "Zunanja omrežja",
|
||||
"No External Networks": "Ni zunanjih omrežij",
|
||||
"downStack": "Ustavi & Odstrani",
|
||||
"connecting...": "Povezovanje s strežnikom…",
|
||||
"reverseProxyMsg1": "Uporabljate obratni proxy?",
|
||||
"extra": "Dodatno",
|
||||
"reconnecting...": "Ponovna povezava …"
|
||||
"No External Networks": "Ni zunanjih omrežij"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"languageName": "Svenska",
|
||||
"Create your admin account": "Skapa ditt Admin-konto",
|
||||
"Create your admin account": "Skapa ditt Admin-konto.",
|
||||
"authIncorrectCreds": "Fel användarnamn eller lösenord.",
|
||||
"PasswordsDoNotMatch": "Lösenorden matchar inte.",
|
||||
"Repeat Password": "Repetera lösenord",
|
||||
@ -12,28 +12,28 @@
|
||||
"registry": "Register",
|
||||
"compose": "Komponera",
|
||||
"addFirstStackMsg": "Komponera din första stack!",
|
||||
"stackName": "Stacknamn",
|
||||
"stackName" : "Stacknamn",
|
||||
"deployStack": "Distribuera",
|
||||
"deleteStack": "Radera",
|
||||
"stopStack": "Stoppa",
|
||||
"stopStack": "Stop",
|
||||
"restartStack": "Starta om",
|
||||
"updateStack": "Uppdatera",
|
||||
"startStack": "Starta",
|
||||
"downStack": "Stoppa & Ner",
|
||||
"downStack": "Stop & Ner",
|
||||
"editStack": "Redigera",
|
||||
"discardStack": "Kasta",
|
||||
"saveStackDraft": "Spara",
|
||||
"notAvailableShort": "N/A",
|
||||
"notAvailableShort" : "N/A",
|
||||
"deleteStackMsg": "Är du säker på att du vill radera stacken?",
|
||||
"stackNotManagedByDockgeMsg": "Denna stacken hanteras inte av Dockge.",
|
||||
"primaryHostname": "Primärt värdnamn",
|
||||
"general": "Allmän",
|
||||
"container": "Container | Containrar",
|
||||
"scanFolder": "Skanna Stackmapp",
|
||||
"dockerImage": "Avbild",
|
||||
"restartPolicyUnlessStopped": "Om inte stoppad",
|
||||
"scanFolder": "Scanna Stackfolder",
|
||||
"dockerImage": "Bild",
|
||||
"restartPolicyUnlessStopped": "Om inte stoppas",
|
||||
"restartPolicyAlways": "Alltid",
|
||||
"restartPolicyOnFailure": "Vid misslyckande",
|
||||
"restartPolicyOnFailure": "Vid Misslyckande",
|
||||
"restartPolicyNo": "Nej",
|
||||
"environmentVariable": "Miljövariabel | Miljövariabler",
|
||||
"restartPolicy": "Omstartspolicy",
|
||||
@ -44,12 +44,12 @@
|
||||
"dependsOn": "Containerberoende | Containerberoenden",
|
||||
"addListItem": "Lägg till {0}",
|
||||
"deleteContainer": "Radera",
|
||||
"addContainer": "Lägg till container",
|
||||
"addNetwork": "Lägg till nätverk",
|
||||
"addContainer": "Lägg till Container",
|
||||
"addNetwork": "Lägg till Nätverk",
|
||||
"disableauth.message1": "Är du säker på att du vill <strong>inaktivera autentisering</strong>?",
|
||||
"disableauth.message2": "Det är designat för scenarion <strong>där du ska implementera tredjepartsautentisering</strong> framför Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
|
||||
"passwordNotMatchMsg": "Det upprepade lösenordet matchar inte.",
|
||||
"autoGet": "Auto-hämta",
|
||||
"disableauth.message2": "Det är designat för senarion <stong>när du ska implementera tredjeparts autentisering</strong> framör Dockge som Cloudflare Access, Authelia eller andra autentiseringsmekanismer.",
|
||||
"passwordNotMatchMsg": "Det upprepade lösenordet matchar inte",
|
||||
"autoGet": "Auto Hämta",
|
||||
"add": "Lägg till",
|
||||
"Edit": "Redigera",
|
||||
"applyToYAML": "Lägg till i YAML",
|
||||
@ -57,8 +57,8 @@
|
||||
"addInternalNetwork": "Lägg till",
|
||||
"Save": "Spara",
|
||||
"Language": "Språk",
|
||||
"Current User": "Nuvarande användare",
|
||||
"Change Password": "Ändra lösenord",
|
||||
"Current User": "Nuvarande användaren",
|
||||
"Change Password": "Byt lösenord",
|
||||
"Current Password": "Nuvarande lösenord",
|
||||
"New Password": "Nytt lösenord",
|
||||
"Repeat New Password": "Upprepa nytt lösenord",
|
||||
@ -70,9 +70,9 @@
|
||||
"I understand, please disable": "Jag förstår, vänligen inaktivera",
|
||||
"Leave": "Lämna",
|
||||
"Frontend Version": "Frontendversion",
|
||||
"Check Update On GitHub": "Kontrollera uppdatering på GitHub",
|
||||
"Check Update On GitHub": "Kontrollera Uppdatering på GitHub",
|
||||
"Show update if available": "Visa uppdatering om tillgänglig",
|
||||
"Also check beta release": "Kontrollera även betaversioner",
|
||||
"Also check beta release": "Kontrollera även betaversionen",
|
||||
"Remember me": "Kom ihåg mig",
|
||||
"Login": "Logga in",
|
||||
"Username": "Användarnamn",
|
||||
@ -80,8 +80,8 @@
|
||||
"Settings": "Inställningar",
|
||||
"Logout": "Logga ut",
|
||||
"Lowercase only": "Endast små tecken",
|
||||
"Convert to Compose": "Omvandla till compose",
|
||||
"Docker Run": "Docker kör",
|
||||
"Convert to Compose": "Omvandla till Compose",
|
||||
"Docker Run": "Docker Run",
|
||||
"active": "aktiv",
|
||||
"exited": "avslutad",
|
||||
"inactive": "inaktiv",
|
||||
@ -89,14 +89,7 @@
|
||||
"Security": "Säkerhet",
|
||||
"About": "Om",
|
||||
"Allowed commands:": "Tillåtna kommandon:",
|
||||
"Internal Networks": "Interna nätverk",
|
||||
"External Networks": "Externa nätverk",
|
||||
"No External Networks": "Inga externa nätverk",
|
||||
"reverseProxyMsg1": "Används omvänd proxy?",
|
||||
"connecting...": "Ansluter till socketserver…",
|
||||
"Cannot connect to the socket server.": "Kan inte ansluta till socketservern.",
|
||||
"reverseProxyMsg2": "Kontrollera hur man konfigurerar webbsocket",
|
||||
"url": "URL | URLer",
|
||||
"extra": "Extra",
|
||||
"reconnecting...": "Återansluter…"
|
||||
"Internal Networks": "Interna Nätverk",
|
||||
"External Networks": "Externa Nätverk",
|
||||
"No External Networks": "Inga Externa Nätverk"
|
||||
}
|
||||
|
@ -91,12 +91,5 @@
|
||||
"Allowed commands:": "คำสั่งที่อนุญาต:",
|
||||
"Internal Networks": "เครือข่ายภายใน",
|
||||
"External Networks": "เครือข่ายภายนอก",
|
||||
"No External Networks": "ไม่มีเครือข่ายภายนอก",
|
||||
"reverseProxyMsg2": "ตรวจสอบวิธีกำหนดค่าสำหรับ WebSocket",
|
||||
"Cannot connect to the socket server.": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ socket ได้",
|
||||
"reverseProxyMsg1": "ใช้ Reverse Proxy หรือไม่?",
|
||||
"connecting...": "กำลังเชื่อมต่อกับเซิร์ฟเวอร์ socket…",
|
||||
"url": "URL | URLs",
|
||||
"extra": "พิเศษ",
|
||||
"reconnecting...": "กำลังเชื่อมต่อใหม่…"
|
||||
}
|
||||
"No External Networks": "ไม่มีเครือข่ายภายนอก"
|
||||
}
|
@ -92,7 +92,7 @@
|
||||
"External Networks": "Зовнішні мережі",
|
||||
"No External Networks": "Немає зовнішніх мереж",
|
||||
"downStack": "Зупинити і вимкнути",
|
||||
"reverseProxyMsg1": "Використовуєте зворотній проксі?",
|
||||
"reverseProxyMsg1": "Використовувати зворотній проксі?",
|
||||
"Cannot connect to the socket server.": "Не вдається підключитися до сервера сокетів.",
|
||||
"reconnecting...": "Повторне підключення…",
|
||||
"connecting...": "Підключення до сервера сокетів…",
|
||||
|
@ -51,7 +51,7 @@
|
||||
"autoGet": "自動取得",
|
||||
"add": "新增",
|
||||
"Edit": "編輯",
|
||||
"applyToYAML": "套用到 YAML",
|
||||
"applyToYAML": "應用到YAML",
|
||||
"createExternalNetwork": "建立",
|
||||
"addInternalNetwork": "新增",
|
||||
"Save": "儲存",
|
||||
@ -71,7 +71,7 @@
|
||||
"Frontend Version": "前端版本",
|
||||
"Check Update On GitHub": "在 GitHub 上檢查更新",
|
||||
"Show update if available": "有更新時提醒我",
|
||||
"Also check beta release": "同時檢查 Beta 版更新",
|
||||
"Also check beta release": "同時檢查 Beta 渠道更新",
|
||||
"Remember me": "記住我",
|
||||
"Login": "登入",
|
||||
"Username": "使用者名稱",
|
||||
@ -92,7 +92,7 @@
|
||||
"External Networks": "外部網路",
|
||||
"No External Networks": "無外部網路",
|
||||
"downStack": "停止",
|
||||
"reverseProxyMsg1": "在使用反向代理嗎?",
|
||||
"reverseProxyMsg1": "在使用反向代理吗?",
|
||||
"reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
|
||||
"Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
|
||||
"reconnecting...": "重新連線中…",
|
||||
|
@ -10,12 +10,12 @@ import { i18n } from "./i18n";
|
||||
// Dependencies
|
||||
import "bootstrap";
|
||||
import Toast, { POSITION, useToast } from "vue-toastification";
|
||||
import "@xterm/xterm/lib/xterm.js";
|
||||
import "xterm/lib/xterm.js";
|
||||
|
||||
// CSS
|
||||
import "@fontsource/jetbrains-mono";
|
||||
import "vue-toastification/dist/index.css";
|
||||
import "@xterm/xterm/css/xterm.css";
|
||||
import "xterm/css/xterm.css";
|
||||
import "./styles/main.scss";
|
||||
|
||||
// Minxins
|
||||
|
@ -2,7 +2,7 @@ import { io } from "socket.io-client";
|
||||
import { Socket } from "socket.io-client";
|
||||
import { defineComponent } from "vue";
|
||||
import jwtDecode from "jwt-decode";
|
||||
import { Terminal } from "@xterm/xterm";
|
||||
import { Terminal } from "xterm";
|
||||
|
||||
let socket : Socket;
|
||||
|
||||
@ -202,10 +202,6 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
socket.on("refresh", () => {
|
||||
location.reload();
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -231,7 +231,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||
import {
|
||||
COMBINED_TERMINAL_COLS,
|
||||
COMBINED_TERMINAL_ROWS,
|
||||
copyYAMLComments, envsubstYAML,
|
||||
copyYAMLComments,
|
||||
getCombinedTerminalName,
|
||||
getComposeTerminalName,
|
||||
PROGRESS_TERMINAL_ROWS,
|
||||
@ -239,7 +239,6 @@ import {
|
||||
} from "../../../backend/util-common";
|
||||
import { BModal } from "bootstrap-vue-next";
|
||||
import NetworkInput from "../components/NetworkInput.vue";
|
||||
import dotenv from "dotenv";
|
||||
|
||||
const template = `version: "3.8"
|
||||
services:
|
||||
@ -278,7 +277,6 @@ export default {
|
||||
return {
|
||||
editorFocus: false,
|
||||
jsonConfig: {},
|
||||
envsubstJSONConfig: {},
|
||||
yamlError: "",
|
||||
processing: true,
|
||||
showProgressTerminal: false,
|
||||
@ -299,12 +297,12 @@ export default {
|
||||
computed: {
|
||||
|
||||
urls() {
|
||||
if (!this.envsubstJSONConfig["x-dockge"] || !this.envsubstJSONConfig["x-dockge"].urls || !Array.isArray(this.envsubstJSONConfig["x-dockge"].urls)) {
|
||||
if (!this.jsonConfig["x-dockge"] || !this.jsonConfig["x-dockge"].urls || !Array.isArray(this.jsonConfig["x-dockge"].urls)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
let urls = [];
|
||||
for (const url of this.envsubstJSONConfig["x-dockge"].urls) {
|
||||
for (const url of this.jsonConfig["x-dockge"].urls) {
|
||||
let display;
|
||||
try {
|
||||
let obj = new URL(url);
|
||||
@ -374,17 +372,6 @@ export default {
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
|
||||
"stack.composeENV": {
|
||||
handler() {
|
||||
if (this.editorFocus) {
|
||||
console.debug("env code changed");
|
||||
this.yamlCodeChange();
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
|
||||
jsonConfig: {
|
||||
handler() {
|
||||
if (!this.editorFocus) {
|
||||
@ -658,41 +645,28 @@ export default {
|
||||
return highlight(code, languages.docker_env);
|
||||
},
|
||||
|
||||
yamlToJSON(yaml) {
|
||||
let doc = parseDocument(yaml);
|
||||
if (doc.errors.length > 0) {
|
||||
throw doc.errors[0];
|
||||
}
|
||||
|
||||
const config = doc.toJS() ?? {};
|
||||
|
||||
// Check data types
|
||||
// "services" must be an object
|
||||
if (!config.services) {
|
||||
config.services = {};
|
||||
}
|
||||
|
||||
if (Array.isArray(config.services) || typeof config.services !== "object") {
|
||||
throw new Error("Services must be an object");
|
||||
}
|
||||
|
||||
return {
|
||||
config,
|
||||
doc,
|
||||
};
|
||||
},
|
||||
|
||||
yamlCodeChange() {
|
||||
try {
|
||||
let { config, doc } = this.yamlToJSON(this.stack.composeYAML);
|
||||
let doc = parseDocument(this.stack.composeYAML);
|
||||
if (doc.errors.length > 0) {
|
||||
throw doc.errors[0];
|
||||
}
|
||||
|
||||
const config = doc.toJS() ?? {};
|
||||
|
||||
// Check data types
|
||||
// "services" must be an object
|
||||
if (!config.services) {
|
||||
config.services = {};
|
||||
}
|
||||
|
||||
if (Array.isArray(config.services) || typeof config.services !== "object") {
|
||||
throw new Error("Services must be an object");
|
||||
}
|
||||
|
||||
this.yamlDoc = doc;
|
||||
this.jsonConfig = config;
|
||||
|
||||
let env = dotenv.parse(this.stack.composeENV);
|
||||
let envYAML = envsubstYAML(this.stack.composeYAML, env);
|
||||
this.envsubstJSONConfig = this.yamlToJSON(envYAML).config;
|
||||
|
||||
clearTimeout(yamlErrorTimeout);
|
||||
this.yamlError = "";
|
||||
} catch (e) {
|
||||
|
25
package.json
25
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dockge",
|
||||
"version": "1.3.4",
|
||||
"version": "1.3.2",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">= 18.0.0 && <= 18.17.1"
|
||||
@ -10,7 +10,6 @@
|
||||
"lint": "eslint \"**/*.{ts,vue}\"",
|
||||
"check-ts": "tsc --noEmit",
|
||||
"start": "tsx ./backend/index.ts",
|
||||
"dev": "concurrently -k -r \"wait-on tcp:5000 && pnpm run dev:backend \" \"pnpm run dev:frontend\"",
|
||||
"dev:backend": "cross-env NODE_ENV=development tsx watch --inspect ./backend/index.ts",
|
||||
"dev:frontend": "cross-env NODE_ENV=development vite --host --config ./frontend/vite.config.ts",
|
||||
"release-final": "tsx ./extra/test-docker.ts && tsx extra/update-version.ts && pnpm run build:frontend && npm run build:docker",
|
||||
@ -25,8 +24,7 @@
|
||||
"reset-password": "tsx ./extra/reset-password.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@homebridge/node-pty-prebuilt-multiarch": "~0.11.12",
|
||||
"@inventage/envsubst": "^0.16.0",
|
||||
"@homebridge/node-pty-prebuilt-multiarch": "~0.11.11",
|
||||
"@louislam/sqlite3": "~15.1.6",
|
||||
"bcryptjs": "~2.4.3",
|
||||
"check-password-strength": "~2.0.7",
|
||||
@ -43,37 +41,34 @@
|
||||
"jwt-decode": "~3.1.2",
|
||||
"knex": "~2.5.1",
|
||||
"limiter-es6-compat": "~2.1.2",
|
||||
"mysql2": "~3.6.5",
|
||||
"mysql2": "~3.6.3",
|
||||
"promisify-child-process": "~4.1.2",
|
||||
"redbean-node": "~0.3.3",
|
||||
"socket.io": "~4.7.2",
|
||||
"socket.io-client": "~4.7.2",
|
||||
"timezones-list": "~3.0.2",
|
||||
"ts-command-line-args": "~2.5.1",
|
||||
"tsx": "~4.6.2",
|
||||
"tsx": "~3.14.0",
|
||||
"type-fest": "~4.3.3",
|
||||
"yaml": "~2.3.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@actions/github": "^6.0.0",
|
||||
"@fontsource/jetbrains-mono": "^5.0.18",
|
||||
"@fontsource/jetbrains-mono": "^5.0.17",
|
||||
"@fortawesome/fontawesome-svg-core": "6.4.2",
|
||||
"@fortawesome/free-regular-svg-icons": "6.4.2",
|
||||
"@fortawesome/free-solid-svg-icons": "6.4.2",
|
||||
"@fortawesome/vue-fontawesome": "3.0.3",
|
||||
"@types/bcryptjs": "^2.4.6",
|
||||
"@types/bootstrap": "~5.2.10",
|
||||
"@types/bootstrap": "~5.2.9",
|
||||
"@types/command-exists": "~1.2.3",
|
||||
"@types/express": "~4.17.21",
|
||||
"@types/jsonwebtoken": "~9.0.5",
|
||||
"@typescript-eslint/eslint-plugin": "~6.8.0",
|
||||
"@typescript-eslint/parser": "~6.8.0",
|
||||
"@vitejs/plugin-vue": "~4.5.2",
|
||||
"@xterm/addon-fit": "beta",
|
||||
"@xterm/xterm": "beta",
|
||||
"@vitejs/plugin-vue": "~4.5.0",
|
||||
"bootstrap": "5.3.2",
|
||||
"bootstrap-vue-next": "~0.14.10",
|
||||
"concurrently": "^8.2.2",
|
||||
"cross-env": "~7.0.3",
|
||||
"eslint": "~8.50.0",
|
||||
"eslint-plugin-jsdoc": "~46.8.2",
|
||||
@ -82,16 +77,16 @@
|
||||
"sass": "~1.68.0",
|
||||
"typescript": "~5.2.2",
|
||||
"unplugin-vue-components": "~0.25.2",
|
||||
"vite": "~5.0.7",
|
||||
"vite": "~5.0.0",
|
||||
"vite-plugin-compression": "~0.5.1",
|
||||
"vue": "~3.3.11",
|
||||
"vue": "~3.3.8",
|
||||
"vue-eslint-parser": "~9.3.2",
|
||||
"vue-i18n": "~9.5.0",
|
||||
"vue-prism-editor": "2.0.0-alpha.2",
|
||||
"vue-qrcode": "~2.2.0",
|
||||
"vue-router": "~4.2.5",
|
||||
"vue-toastification": "2.0.0-rc.5",
|
||||
"wait-on": "^7.2.0",
|
||||
"xterm": "5.4.0-beta.37",
|
||||
"xterm-addon-web-links": "~0.9.0"
|
||||
}
|
||||
}
|
||||
|
1396
pnpm-lock.yaml
generated
1396
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user