Merge branch 'master' into multiple
# Conflicts: # backend/socket-handlers/docker-socket-handler.ts # backend/util-server.ts # frontend/src/components/StackList.vue # package.json # pnpm-lock.yaml
This commit is contained in:
Louis Lam
commit
cc3fe01c1b
29 changed files with 794 additions and 171 deletions
3
.github/DISCUSSION_TEMPLATE/ask-for-help.yml
vendored
3
.github/DISCUSSION_TEMPLATE/ask-for-help.yml
vendored
|
|
@ -1,5 +1,4 @@
|
|||
title: "❓ Ask for help"
|
||||
labels: [help]
|
||||
labels: [help]
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: no-duplicate-issues
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
title: 🚀 Feature Request
|
||||
labels: [feature-request]
|
||||
body:
|
||||
- type: checkboxes
|
||||
|
|
@ -52,4 +51,4 @@ body:
|
|||
attributes:
|
||||
label: "📝 Additional Context"
|
||||
description: "Add any other context or screenshots about the feature request here."
|
||||
placeholder: "..."
|
||||
placeholder: "..."
|
||||
|
|
|
|||
8
.github/ISSUE_TEMPLATE/ask-for-help.yaml
vendored
8
.github/ISSUE_TEMPLATE/ask-for-help.yaml
vendored
|
|
@ -1,14 +1,14 @@
|
|||
name: "❓ Ask for help"
|
||||
description: "Please go to the Discussions tab to submit a Help Request"
|
||||
name: "⚠️ Ask for help (Please go to the \"Discussions\" tab to submit a Help Request)"
|
||||
description: "⚠️ Please go to the \"Discussions\" tab to submit a Help Request"
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
|
||||
⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
|
||||
- type: checkboxes
|
||||
id: no-duplicate-issues
|
||||
attributes:
|
||||
label: "Issues are for bug reports only"
|
||||
label: "Issues are for bug reports only, please go to the \"Discussions\" tab to submit a Feature Request"
|
||||
options:
|
||||
- label: "I understand"
|
||||
required: true
|
||||
|
|
|
|||
8
.github/ISSUE_TEMPLATE/feature_request.yaml
vendored
8
.github/ISSUE_TEMPLATE/feature_request.yaml
vendored
|
|
@ -1,14 +1,14 @@
|
|||
name: 🚀 Feature Request
|
||||
description: "Please go to the Discussions tab to submit a Feature Request"
|
||||
name: 🚀 Feature Request (Please go to the "Discussions" tab to submit a Feature Request)
|
||||
description: "⚠️ Please go to the \"Discussions\" tab to submit a Feature Request"
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Please go to https://github.com/louislam/dockge/discussions/new?category=feature-request
|
||||
⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ Please go to https://github.com/louislam/dockge/discussions/new?category=ask-for-help
|
||||
- type: checkboxes
|
||||
id: no-duplicate-issues
|
||||
attributes:
|
||||
label: "Issues are for bug reports only"
|
||||
label: "Issues are for bug reports only, please go to the \"Discussions\" tab to submit a Feature Request"
|
||||
options:
|
||||
- label: "I understand"
|
||||
required: true
|
||||
|
|
|
|||
|
|
@ -29,12 +29,14 @@ import { Stack } from "./stack";
|
|||
import { Cron } from "croner";
|
||||
import gracefulShutdown from "http-graceful-shutdown";
|
||||
import User from "./models/user";
|
||||
import childProcess from "child_process";
|
||||
import childProcessAsync from "promisify-child-process";
|
||||
import { Terminal } from "./terminal";
|
||||
import { DockgeInstanceManager } from "./dockge-instance-manager";
|
||||
|
||||
import "dotenv/config";
|
||||
|
||||
import "dotenv/config";
|
||||
|
||||
export class DockgeServer {
|
||||
app : Express;
|
||||
httpServer : http.Server;
|
||||
|
|
@ -500,7 +502,7 @@ export class DockgeServer {
|
|||
return jwtSecretBean;
|
||||
}
|
||||
|
||||
sendStackList(useCache = false) {
|
||||
async sendStackList(useCache = false) {
|
||||
let roomList = this.io.sockets.adapter.rooms.keys();
|
||||
let map : Map<string, object> | undefined;
|
||||
|
||||
|
|
@ -511,7 +513,7 @@ export class DockgeServer {
|
|||
// Get the list only if there is a room
|
||||
if (!map) {
|
||||
map = new Map();
|
||||
let stackList = Stack.getStackList(this, useCache);
|
||||
let stackList = await Stack.getStackList(this, useCache);
|
||||
|
||||
for (let [ stackName, stack ] of stackList) {
|
||||
map.set(stackName, stack.toSimpleJSON());
|
||||
|
|
@ -527,8 +529,8 @@ export class DockgeServer {
|
|||
}
|
||||
}
|
||||
|
||||
sendStackStatusList() {
|
||||
let statusList = Stack.getStatusList();
|
||||
async sendStackStatusList() {
|
||||
let statusList = await Stack.getStatusList();
|
||||
|
||||
let roomList = this.io.sockets.adapter.rooms.keys();
|
||||
|
||||
|
|
@ -546,8 +548,15 @@ export class DockgeServer {
|
|||
}
|
||||
}
|
||||
|
||||
getDockerNetworkList() : string[] {
|
||||
let res = childProcess.spawnSync("docker", [ "network", "ls", "--format", "{{.Name}}" ]);
|
||||
async getDockerNetworkList() : Promise<string[]> {
|
||||
let res = await childProcessAsync.spawn("docker", [ "network", "ls", "--format", "{{.Name}}" ], {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
|
||||
if (!res.stdout) {
|
||||
return [];
|
||||
}
|
||||
|
||||
let list = res.stdout.toString().split("\n");
|
||||
|
||||
// Remove empty string item
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ import { convertToLocalStackName, convertToRemoteStackID, isRemoteStackName, Loo
|
|||
export class DockerSocketHandler extends SocketHandler {
|
||||
create(socket : DockgeSocket, server : DockgeServer) {
|
||||
|
||||
socket.on("deployStack", async (name : unknown, composeYAML : unknown, isAdd : unknown, callback) => {
|
||||
socket.on("deployStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
|
||||
try {
|
||||
checkLogin(socket);
|
||||
const stack = this.saveStack(socket, server, name, composeYAML, isAdd);
|
||||
const stack = await this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
|
||||
await stack.deploy(socket);
|
||||
server.sendStackList();
|
||||
callback({
|
||||
|
|
@ -26,10 +26,10 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
}
|
||||
});
|
||||
|
||||
socket.on("saveStack", async (name : unknown, composeYAML : unknown, isAdd : unknown, callback) => {
|
||||
socket.on("saveStack", async (name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown, callback) => {
|
||||
try {
|
||||
checkLogin(socket);
|
||||
this.saveStack(socket, server, name, composeYAML, isAdd);
|
||||
this.saveStack(socket, server, name, composeYAML, composeENV, isAdd);
|
||||
callback({
|
||||
ok: true,
|
||||
"msg": "Saved"
|
||||
|
|
@ -46,7 +46,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
if (typeof(name) !== "string") {
|
||||
throw new ValidationError("Name must be a string");
|
||||
}
|
||||
const stack = Stack.getStack(server, name);
|
||||
const stack = await Stack.getStack(server, name);
|
||||
|
||||
try {
|
||||
await stack.delete(socket);
|
||||
|
|
@ -66,7 +66,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
}
|
||||
});
|
||||
|
||||
this.event("getStack", socket, (req : LooseObject, callback) => {
|
||||
socket.on("getStack", async (req : LooseObject, callback) => {
|
||||
try {
|
||||
checkLogin(socket);
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
}
|
||||
|
||||
let stackName = req.stackName;
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
|
||||
if (stack.isManagedByDockge) {
|
||||
stack.joinCombinedTerminal(socket);
|
||||
|
|
@ -113,7 +113,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.start(socket);
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -137,7 +137,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.stop(socket);
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -158,7 +158,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.restart(socket);
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -179,7 +179,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.update(socket);
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -200,7 +200,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.down(socket);
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -221,7 +221,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName, true);
|
||||
const stack = await Stack.getStack(server, stackName, true);
|
||||
const serviceStatusList = Object.fromEntries(await stack.getServiceStatusList());
|
||||
callback({
|
||||
ok: true,
|
||||
|
|
@ -236,7 +236,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
socket.on("getDockerNetworkList", async (callback) => {
|
||||
try {
|
||||
checkLogin(socket);
|
||||
const dockerNetworkList = server.getDockerNetworkList();
|
||||
const dockerNetworkList = await server.getDockerNetworkList();
|
||||
callback({
|
||||
ok: true,
|
||||
dockerNetworkList,
|
||||
|
|
@ -266,7 +266,7 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
});
|
||||
}
|
||||
|
||||
saveStack(socket : DockgeSocket, server : DockgeServer, name : unknown, composeYAML : unknown, isAdd : unknown) : Stack {
|
||||
async saveStack(socket : DockgeSocket, server : DockgeServer, name : unknown, composeYAML : unknown, composeENV : unknown, isAdd : unknown) : Promise<Stack> {
|
||||
// Check types
|
||||
if (typeof(name) !== "string") {
|
||||
throw new ValidationError("Name must be a string");
|
||||
|
|
@ -274,12 +274,15 @@ export class DockerSocketHandler extends SocketHandler {
|
|||
if (typeof(composeYAML) !== "string") {
|
||||
throw new ValidationError("Compose YAML must be a string");
|
||||
}
|
||||
if (typeof(composeENV) !== "string") {
|
||||
throw new ValidationError("Compose ENV must be a string");
|
||||
}
|
||||
if (typeof(isAdd) !== "boolean") {
|
||||
throw new ValidationError("isAdd must be a boolean");
|
||||
}
|
||||
|
||||
const stack = new Stack(server, name, composeYAML);
|
||||
stack.save(isAdd);
|
||||
const stack = new Stack(server, name, composeYAML, composeENV, false);
|
||||
await stack.save(isAdd);
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ export class TerminalSocketHandler extends SocketHandler {
|
|||
log.debug("interactiveTerminal", "Service name: " + serviceName);
|
||||
|
||||
// Get stack
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
stack.joinContainerTerminal(socket, serviceName, shell);
|
||||
|
||||
callback({
|
||||
|
|
@ -141,7 +141,7 @@ export class TerminalSocketHandler extends SocketHandler {
|
|||
throw new ValidationError("Stack name must be a string.");
|
||||
}
|
||||
|
||||
const stack = Stack.getStack(server, stackName);
|
||||
const stack = await Stack.getStack(server, stackName);
|
||||
await stack.leaveCombinedTerminal(socket);
|
||||
|
||||
callback({
|
||||
|
|
|
|||
150
backend/stack.ts
150
backend/stack.ts
|
|
@ -1,8 +1,8 @@
|
|||
import { DockgeServer } from "./dockge-server";
|
||||
import fs from "fs";
|
||||
import fs, { promises as fsAsync } from "fs";
|
||||
import { log } from "./log";
|
||||
import yaml from "yaml";
|
||||
import { DockgeSocket, ValidationError } from "./util-server";
|
||||
import { DockgeSocket, fileExists, ValidationError } from "./util-server";
|
||||
import path from "path";
|
||||
import {
|
||||
COMBINED_TERMINAL_COLS,
|
||||
|
|
@ -16,7 +16,7 @@ import {
|
|||
UNKNOWN
|
||||
} from "./util-common";
|
||||
import { InteractiveTerminal, Terminal } from "./terminal";
|
||||
import childProcess from "child_process";
|
||||
import childProcessAsync from "promisify-child-process";
|
||||
|
||||
export class Stack {
|
||||
|
||||
|
|
@ -24,6 +24,7 @@ export class Stack {
|
|||
|
||||
protected _status: number = UNKNOWN;
|
||||
protected _composeYAML?: string;
|
||||
protected _composeENV?: string;
|
||||
protected _configFilePath?: string;
|
||||
protected _composeFileName: string = "compose.yaml";
|
||||
protected server: DockgeServer;
|
||||
|
|
@ -32,10 +33,11 @@ export class Stack {
|
|||
|
||||
protected static managedStackList: Map<string, Stack> = new Map();
|
||||
|
||||
constructor(server : DockgeServer, name : string, composeYAML? : string, skipFSOperations = false) {
|
||||
constructor(server : DockgeServer, name : string, composeYAML? : string, composeENV? : string, skipFSOperations = false) {
|
||||
this.name = name;
|
||||
this.server = server;
|
||||
this._composeYAML = composeYAML;
|
||||
this._composeENV = composeENV;
|
||||
|
||||
if (!skipFSOperations) {
|
||||
// Check if compose file name is different from compose.yaml
|
||||
|
|
@ -54,6 +56,7 @@ export class Stack {
|
|||
return {
|
||||
...obj,
|
||||
composeYAML: this.composeYAML,
|
||||
composeENV: this.composeENV,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -72,11 +75,15 @@ export class Stack {
|
|||
/**
|
||||
* Get the status of the stack from `docker compose ps --format json`
|
||||
*/
|
||||
ps() : object {
|
||||
let res = childProcess.execSync("docker compose ps --format json", {
|
||||
cwd: this.path
|
||||
async ps() : Promise<object> {
|
||||
let res = await childProcessAsync.spawn("docker", [ "compose", "ps", "--format", "json" ], {
|
||||
cwd: this.path,
|
||||
encoding: "utf-8",
|
||||
});
|
||||
return JSON.parse(res.toString());
|
||||
if (!res.stdout) {
|
||||
return {};
|
||||
}
|
||||
return JSON.parse(res.stdout.toString());
|
||||
}
|
||||
|
||||
get isManagedByDockge() : boolean {
|
||||
|
|
@ -95,6 +102,15 @@ export class Stack {
|
|||
|
||||
// Check YAML format
|
||||
yaml.parse(this.composeYAML);
|
||||
|
||||
let lines = this.composeENV.split("\n");
|
||||
|
||||
// Check if the .env is able to pass docker-compose
|
||||
// Prevent "setenv: The parameter is incorrect"
|
||||
// It only happens when there is one line and it doesn't contain "="
|
||||
if (lines.length === 1 && !lines[0].includes("=") && lines[0].length > 0) {
|
||||
throw new ValidationError("Invalid .env format");
|
||||
}
|
||||
}
|
||||
|
||||
get composeYAML() : string {
|
||||
|
|
@ -108,6 +124,17 @@ export class Stack {
|
|||
return this._composeYAML;
|
||||
}
|
||||
|
||||
get composeENV() : string {
|
||||
if (this._composeENV === undefined) {
|
||||
try {
|
||||
this._composeENV = fs.readFileSync(path.join(this.path, ".env"), "utf-8");
|
||||
} catch (e) {
|
||||
this._composeENV = "";
|
||||
}
|
||||
}
|
||||
return this._composeENV;
|
||||
}
|
||||
|
||||
get path() : string {
|
||||
return path.join(this.server.stacksDir, this.name);
|
||||
}
|
||||
|
|
@ -131,27 +158,35 @@ export class Stack {
|
|||
* Save the stack to the disk
|
||||
* @param isAdd
|
||||
*/
|
||||
save(isAdd : boolean) {
|
||||
async save(isAdd : boolean) {
|
||||
this.validate();
|
||||
|
||||
let dir = this.path;
|
||||
|
||||
// Check if the name is used if isAdd
|
||||
if (isAdd) {
|
||||
if (fs.existsSync(dir)) {
|
||||
if (await fileExists(dir)) {
|
||||
throw new ValidationError("Stack name already exists");
|
||||
}
|
||||
|
||||
// Create the stack folder
|
||||
fs.mkdirSync(dir);
|
||||
await fsAsync.mkdir(dir);
|
||||
} else {
|
||||
if (!fs.existsSync(dir)) {
|
||||
if (!await fileExists(dir)) {
|
||||
throw new ValidationError("Stack not found");
|
||||
}
|
||||
}
|
||||
|
||||
// Write or overwrite the compose.yaml
|
||||
fs.writeFileSync(path.join(dir, this._composeFileName), this.composeYAML);
|
||||
await fsAsync.writeFile(path.join(dir, this._composeFileName), this.composeYAML);
|
||||
|
||||
const envPath = path.join(dir, ".env");
|
||||
|
||||
// Write or overwrite the .env
|
||||
// If .env is not existing and the composeENV is empty, we don't need to write it
|
||||
if (await fileExists(envPath) || this.composeENV.trim() !== "") {
|
||||
await fsAsync.writeFile(envPath, this.composeENV);
|
||||
}
|
||||
}
|
||||
|
||||
async deploy(socket? : DockgeSocket) : Promise<number> {
|
||||
|
|
@ -171,7 +206,7 @@ export class Stack {
|
|||
}
|
||||
|
||||
// Remove the stack folder
|
||||
fs.rmSync(this.path, {
|
||||
await fsAsync.rm(this.path, {
|
||||
recursive: true,
|
||||
force: true
|
||||
});
|
||||
|
|
@ -179,8 +214,8 @@ export class Stack {
|
|||
return exitCode;
|
||||
}
|
||||
|
||||
updateStatus() {
|
||||
let statusList = Stack.getStatusList();
|
||||
async updateStatus() {
|
||||
let statusList = await Stack.getStatusList();
|
||||
let status = statusList.get(this.name);
|
||||
|
||||
if (status) {
|
||||
|
|
@ -190,7 +225,7 @@ export class Stack {
|
|||
}
|
||||
}
|
||||
|
||||
static getStackList(server : DockgeServer, useCacheForManaged = false) : Map<string, Stack> {
|
||||
static async getStackList(server : DockgeServer, useCacheForManaged = false) : Promise<Map<string, Stack>> {
|
||||
let stacksDir = server.stacksDir;
|
||||
let stackList : Map<string, Stack>;
|
||||
|
||||
|
|
@ -201,16 +236,16 @@ export class Stack {
|
|||
stackList = new Map<string, Stack>();
|
||||
|
||||
// Scan the stacks directory, and get the stack list
|
||||
let filenameList = fs.readdirSync(stacksDir);
|
||||
let filenameList = await fsAsync.readdir(stacksDir);
|
||||
|
||||
for (let filename of filenameList) {
|
||||
try {
|
||||
// Check if it is a directory
|
||||
let stat = fs.statSync(path.join(stacksDir, filename));
|
||||
let stat = await fsAsync.stat(path.join(stacksDir, filename));
|
||||
if (!stat.isDirectory()) {
|
||||
continue;
|
||||
}
|
||||
let stack = this.getStack(server, filename);
|
||||
let stack = await this.getStack(server, filename);
|
||||
stack._status = CREATED_FILE;
|
||||
stackList.set(filename, stack);
|
||||
} catch (e) {
|
||||
|
|
@ -225,8 +260,15 @@ export class Stack {
|
|||
}
|
||||
|
||||
// Get status from docker compose ls
|
||||
let res = childProcess.execSync("docker compose ls --all --format json");
|
||||
let composeList = JSON.parse(res.toString());
|
||||
let res = await childProcessAsync.spawn("docker", [ "compose", "ls", "--all", "--format", "json" ], {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
|
||||
if (!res.stdout) {
|
||||
return stackList;
|
||||
}
|
||||
|
||||
let composeList = JSON.parse(res.stdout.toString());
|
||||
|
||||
for (let composeStack of composeList) {
|
||||
let stack = stackList.get(composeStack.Name);
|
||||
|
|
@ -252,11 +294,18 @@ export class Stack {
|
|||
* Get the status list, it will be used to update the status of the stacks
|
||||
* Not all status will be returned, only the stack that is deployed or created to `docker compose` will be returned
|
||||
*/
|
||||
static getStatusList() : Map<string, number> {
|
||||
static async getStatusList() : Promise<Map<string, number>> {
|
||||
let statusList = new Map<string, number>();
|
||||
|
||||
let res = childProcess.execSync("docker compose ls --all --format json");
|
||||
let composeList = JSON.parse(res.toString());
|
||||
let res = await childProcessAsync.spawn("docker", [ "compose", "ls", "--all", "--format", "json" ], {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
|
||||
if (!res.stdout) {
|
||||
return statusList;
|
||||
}
|
||||
|
||||
let composeList = JSON.parse(res.stdout.toString());
|
||||
|
||||
for (let composeStack of composeList) {
|
||||
statusList.set(composeStack.Name, this.statusConvert(composeStack.Status));
|
||||
|
|
@ -284,13 +333,13 @@ export class Stack {
|
|||
}
|
||||
}
|
||||
|
||||
static getStack(server: DockgeServer, stackName: string, skipFSOperations = false) : Stack {
|
||||
static async getStack(server: DockgeServer, stackName: string, skipFSOperations = false) : Promise<Stack> {
|
||||
let dir = path.join(server.stacksDir, stackName);
|
||||
|
||||
if (!skipFSOperations) {
|
||||
if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
|
||||
if (!await fileExists(dir) || !(await fsAsync.stat(dir)).isDirectory()) {
|
||||
// Maybe it is a stack managed by docker compose directly
|
||||
let stackList = this.getStackList(server, true);
|
||||
let stackList = await this.getStackList(server, true);
|
||||
let stack = stackList.get(stackName);
|
||||
|
||||
if (stack) {
|
||||
|
|
@ -309,7 +358,7 @@ export class Stack {
|
|||
if (!skipFSOperations) {
|
||||
stack = new Stack(server, stackName);
|
||||
} else {
|
||||
stack = new Stack(server, stackName, undefined, true);
|
||||
stack = new Stack(server, stackName, undefined, undefined, true);
|
||||
}
|
||||
|
||||
stack._status = UNKNOWN;
|
||||
|
|
@ -361,7 +410,7 @@ export class Stack {
|
|||
}
|
||||
|
||||
// If the stack is not running, we don't need to restart it
|
||||
this.updateStatus();
|
||||
await this.updateStatus();
|
||||
log.debug("update", "Status: " + this.status);
|
||||
if (this.status !== RUNNING) {
|
||||
return exitCode;
|
||||
|
|
@ -409,24 +458,35 @@ export class Stack {
|
|||
async getServiceStatusList() {
|
||||
let statusList = new Map<string, number>();
|
||||
|
||||
let res = childProcess.spawnSync("docker", [ "compose", "ps", "--format", "json" ], {
|
||||
cwd: this.path,
|
||||
});
|
||||
try {
|
||||
let res = await childProcessAsync.spawn("docker", [ "compose", "ps", "--format", "json" ], {
|
||||
cwd: this.path,
|
||||
encoding: "utf-8",
|
||||
});
|
||||
|
||||
let lines = res.stdout.toString().split("\n");
|
||||
|
||||
for (let line of lines) {
|
||||
try {
|
||||
let obj = JSON.parse(line);
|
||||
if (obj.Health === "") {
|
||||
statusList.set(obj.Service, obj.State);
|
||||
} else {
|
||||
statusList.set(obj.Service, obj.Health);
|
||||
}
|
||||
} catch (e) {
|
||||
if (!res.stdout) {
|
||||
return statusList;
|
||||
}
|
||||
|
||||
let lines = res.stdout?.toString().split("\n");
|
||||
|
||||
for (let line of lines) {
|
||||
try {
|
||||
let obj = JSON.parse(line);
|
||||
if (obj.Health === "") {
|
||||
statusList.set(obj.Service, obj.State);
|
||||
} else {
|
||||
statusList.set(obj.Service, obj.Health);
|
||||
}
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
|
||||
return statusList;
|
||||
} catch (e) {
|
||||
log.error("getServiceStatusList", e);
|
||||
return statusList;
|
||||
}
|
||||
|
||||
return statusList;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { log } from "./log";
|
|||
import { ERROR_TYPE_VALIDATION } from "./util-common";
|
||||
import { R } from "redbean-node";
|
||||
import { verifyPassword } from "./password-hash";
|
||||
import fs from "fs";
|
||||
import { DockgeInstanceManager } from "./dockge-instance-manager";
|
||||
|
||||
export interface JWTDecoded {
|
||||
|
|
@ -85,3 +86,9 @@ export async function doubleCheckPassword(socket : DockgeSocket, currentPassword
|
|||
|
||||
return user;
|
||||
}
|
||||
|
||||
export function fileExists(file : string) {
|
||||
return fs.promises.access(file, fs.constants.F_OK)
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,10 +19,14 @@ const languageList = {
|
|||
"ru": "Русский",
|
||||
"cs-CZ": "Čeština",
|
||||
"ar": "العربية",
|
||||
"th":"ไทย",
|
||||
"it-IT":"Italiano",
|
||||
"sv-SE":"Svenska",
|
||||
"uk-UA":"Українська"
|
||||
"th": "ไทย",
|
||||
"it-IT": "Italiano",
|
||||
"sv-SE": "Svenska",
|
||||
"uk-UA": "Українська",
|
||||
"da": "Dansk",
|
||||
"ja": "日本語",
|
||||
"nl": "Nederlands",
|
||||
"ro": "Română",
|
||||
};
|
||||
|
||||
let messages = {
|
||||
|
|
@ -35,7 +39,7 @@ for (let lang in languageList) {
|
|||
};
|
||||
}
|
||||
|
||||
const rtlLangs = [ "fa", "ar-SY", "ur" ];
|
||||
const rtlLangs = [ "fa", "ar-SY", "ur", "ar" ];
|
||||
|
||||
export const currentLocale = () => localStorage.locale
|
||||
|| languageList[navigator.language] && navigator.language
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
"registry": "السجل",
|
||||
"compose": "أنشاء كمبوز",
|
||||
"addFirstStackMsg": "أنشيء أول كمبوز!",
|
||||
"stackName" : "اسم المكدسة",
|
||||
"deployStack": "شنر",
|
||||
"stackName": "اسم المكدسة",
|
||||
"deployStack": "نشر",
|
||||
"deleteStack": "حذف",
|
||||
"stopStack": "إيقاف",
|
||||
"restartStack": "إعادة تشغيل",
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
"editStack": "تعديل",
|
||||
"discardStack": "إهمال",
|
||||
"saveStackDraft": "حفظ",
|
||||
"notAvailableShort" : "غير متوفر",
|
||||
"notAvailableShort": "غير متوفر",
|
||||
"deleteStackMsg": "هل أنت متأكد أنك تريد حذف هذه المكدسة؟",
|
||||
"stackNotManagedByDockgeMsg": "لا يتم إدارة هذه المكدس بواسطة Dockge.",
|
||||
"primaryHostname": "اسم المضيف الرئيسي",
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
"deleteContainer": "حذف",
|
||||
"addContainer": "أضافة حاوية",
|
||||
"addNetwork": "أضافة شبكة",
|
||||
"disableauth.message1": "هل أنت متأكد أنك تريد <strong>تعطيل المصادقة</strong>?",
|
||||
"disableauth.message1": "هل أنت متأكد أنك تريد <strong>تعطيل المصادقة</strong>؟",
|
||||
"disableauth.message2": "إنه مصمم للحالات <strong>التي تنوي فيها مصادقة الطرف الثالث</strong> أمام Dockge مثل Cloudflare Access, Authelia أو أي من آليات المصادقة الأخرى.",
|
||||
"passwordNotMatchMsg": "كلمة المرور المكررة غير متطابقة.",
|
||||
"autoGet": "الجلب التلقائي",
|
||||
|
|
@ -91,5 +91,12 @@
|
|||
"Allowed commands:": "الأوامر المسموح بها:",
|
||||
"Internal Networks": "الشبكات الداخلية",
|
||||
"External Networks": "الشبكات الخارجية",
|
||||
"No External Networks": "لا توجد شبكات خارجية"
|
||||
"No External Networks": "لا توجد شبكات خارجية",
|
||||
"reverseProxyMsg2": "تحقق كيف يتم إعداده لمقبس ويب",
|
||||
"Cannot connect to the socket server.": "تعذر الاتصال بخادم المقبس.",
|
||||
"reconnecting...": "إعادة الاتصال…",
|
||||
"url": "رابط | روابط",
|
||||
"extra": "إضافات",
|
||||
"reverseProxyMsg1": "هل تستدخم خادم عكسي؟",
|
||||
"connecting...": "جاري الاتصال بخادم المقبس…"
|
||||
}
|
||||
|
|
|
|||
102
frontend/src/lang/da.json
Normal file
102
frontend/src/lang/da.json
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
{
|
||||
"languageName": "Dansk",
|
||||
"authIncorrectCreds": "Forkert brugernavn eller adgangskode.",
|
||||
"PasswordsDoNotMatch": "Adgangskode stemmer ikke overens.",
|
||||
"Repeat Password": "Gentag adgangskode",
|
||||
"Create": "Opret",
|
||||
"signedInDisp": "Logget ind som {0}",
|
||||
"signedInDispDisabled": "Auth Deaktiveret.",
|
||||
"home": "Hjem",
|
||||
"console": "Konsol",
|
||||
"registry": "Registry",
|
||||
"compose": "Compose",
|
||||
"stackName": "Stack-navn",
|
||||
"deployStack": "Udrulle",
|
||||
"deleteStack": "Slet",
|
||||
"stopStack": "Stop",
|
||||
"restartStack": "Genstart",
|
||||
"updateStack": "Opdatere",
|
||||
"startStack": "Start",
|
||||
"downStack": "Stop & Sluk",
|
||||
"editStack": "Editere",
|
||||
"discardStack": "Annuller",
|
||||
"saveStackDraft": "Gem",
|
||||
"notAvailableShort": "Ugyldig",
|
||||
"stackNotManagedByDockgeMsg": "Denne stack administreres ikke af Dockge.",
|
||||
"primaryHostname": "Primært værtsnavn",
|
||||
"general": "Generelt",
|
||||
"container": "Container | Containere",
|
||||
"scanFolder": "Scan Stack-mappe",
|
||||
"dockerImage": "Billede",
|
||||
"restartPolicyUnlessStopped": "Medmindre stoppet",
|
||||
"restartPolicyAlways": "Altid",
|
||||
"restartPolicyOnFailure": "Ved fejl",
|
||||
"restartPolicyNo": "Nej",
|
||||
"restartPolicy": "Genstart politik",
|
||||
"containerName": "Container navn",
|
||||
"port": "Port | Porte",
|
||||
"volume": "Volumen | Voluminer",
|
||||
"network": "Netværk | Netværker",
|
||||
"dependsOn": "Container Dependency | Container Dependencies",
|
||||
"addListItem": "Tilføj {0}",
|
||||
"deleteContainer": "Slet",
|
||||
"addNetwork": "Tilføj Netværk",
|
||||
"passwordNotMatchMsg": "Koden du gentog stemmer ikke overens.",
|
||||
"autoGet": "Auto Get",
|
||||
"add": "Tilføj",
|
||||
"Edit": "Redigere",
|
||||
"applyToYAML": "Anvend til YAML",
|
||||
"createExternalNetwork": "Skabe",
|
||||
"addInternalNetwork": "Tilføj",
|
||||
"Save": "Gem",
|
||||
"Language": "Sprog",
|
||||
"Current User": "Nuværende bruger",
|
||||
"Change Password": "Ændre adgangskode",
|
||||
"Current Password": "Nuværende adgangskode",
|
||||
"New Password": "Ny adgangskode",
|
||||
"Repeat New Password": "Gentag ny adgangskode",
|
||||
"Update Password": "Opdater adgangskode",
|
||||
"Advanced": "Avanceret",
|
||||
"Please use this option carefully!": "Brug venligst denne indstilling forsigtigt!",
|
||||
"Enable Auth": "Aktiver Auth",
|
||||
"Disable Auth": "Deaktiver Auth",
|
||||
"I understand, please disable": "Jeg forstår, venligst deaktiver",
|
||||
"Leave": "Forlad",
|
||||
"Frontend Version": "Frontend Version",
|
||||
"Check Update On GitHub": "Tjek opdatering på GitHub",
|
||||
"Also check beta release": "Tjek også betaversionen",
|
||||
"Remember me": "Husk mig",
|
||||
"Login": "Login",
|
||||
"Username": "Brugernavn",
|
||||
"Password": "Adgangskode",
|
||||
"Settings": "Indstillinger",
|
||||
"Logout": "Log ud",
|
||||
"Convert to Compose": "Konverter til Compose",
|
||||
"active": "aktive",
|
||||
"exited": "forladt",
|
||||
"inactive": "inaktive",
|
||||
"Appearance": "Udseende",
|
||||
"Security": "Sikkerhed",
|
||||
"Docker Run": "Docker Kør",
|
||||
"About": "Om",
|
||||
"Allowed commands:": "Tilladte kommandoer:",
|
||||
"Internal Networks": "Interne netværk",
|
||||
"External Networks": "Eksterne netværk",
|
||||
"No External Networks": "Ingen eksterne netværk",
|
||||
"reverseProxyMsg1": "Bruger du en Reverse-Proxy?",
|
||||
"reverseProxyMsg2": "Tjek, hvordan du konfigurerer det til WebSocket",
|
||||
"Cannot connect to the socket server.": "Kan ikke oprette forbindelse til socket-serveren.",
|
||||
"reconnecting...": "Genopretter forbindelse…",
|
||||
"connecting...": "Opretter forbindelse til socket-serveren…",
|
||||
"url": "URL | URL'er",
|
||||
"extra": "Ekstra",
|
||||
"Create your admin account": "Opret din administratorkonto",
|
||||
"addFirstStackMsg": "Compose din første stack!",
|
||||
"deleteStackMsg": "Er du sikker på, at du vil slette denne stack?",
|
||||
"environmentVariable": "Miljøvariabel | miljøvariabler",
|
||||
"addContainer": "Tilføj Container",
|
||||
"disableauth.message1": "Er du sikker på, at du vil <strong>deaktivere godkendelse</strong>?",
|
||||
"disableauth.message2": "Det er designet til scenarier <strong>hvor du har til hensigt at implementere tredjepartsgodkendelse</strong> foran Dockge såsom Cloudflare Access, Authelia eller andre godkendelsesmekanismer.",
|
||||
"Show update if available": "Vis opdatering, hvis tilgængelig",
|
||||
"Lowercase only": "Kun små bogstaver"
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
"Repeat Password": "Passwort wiederholen",
|
||||
"Create": "Erstellen",
|
||||
"signedInDisp": "Angemeldet als {0}",
|
||||
"signedInDispDisabled": "Authentifizierung deaktiviert.",
|
||||
"signedInDispDisabled": "Anmeldung deaktiviert.",
|
||||
"home": "Startseite",
|
||||
"console": "Konsole",
|
||||
"registry": "Register",
|
||||
"compose": "Zusammenstellen",
|
||||
"registry": "Container Registry",
|
||||
"compose": "",
|
||||
"addFirstStackMsg": "Stelle deinen ersten Stack zusammen!",
|
||||
"stackName" : "Stack-Name",
|
||||
"deployStack": "Bereitstellen",
|
||||
"stackName": "Stack-Name",
|
||||
"deployStack": "Deployen",
|
||||
"deleteStack": "Löschen",
|
||||
"stopStack": "Anhalten",
|
||||
"restartStack": "Neustarten",
|
||||
|
|
@ -22,33 +22,33 @@
|
|||
"editStack": "Bearbeiten",
|
||||
"discardStack": "Verwerfen",
|
||||
"saveStackDraft": "Speichern",
|
||||
"notAvailableShort" : "N/A",
|
||||
"notAvailableShort": "N/V",
|
||||
"deleteStackMsg": "Möchtest du diesen Stack wirklich löschen?",
|
||||
"stackNotManagedByDockgeMsg": "Dieser Stack wird nicht von Dockge verwaltet.",
|
||||
"primaryHostname": "Primärer Hostname",
|
||||
"general": "Allgemein",
|
||||
"container": "Container | Container",
|
||||
"container": "Container",
|
||||
"scanFolder": "Stacks-Ordner durchsuchen",
|
||||
"dockerImage": "Image",
|
||||
"restartPolicyUnlessStopped": "Falls nicht gestoppt",
|
||||
"restartPolicyAlways": "Immer",
|
||||
"restartPolicyOnFailure": "Bei Fehler",
|
||||
"restartPolicyNo": "Kein Neustart",
|
||||
"environmentVariable": "Umgebungsvariable | Umgebungsvariablen",
|
||||
"environmentVariable": "Umgebungsvariable/n",
|
||||
"restartPolicy": "Neustart Richtlinie",
|
||||
"containerName": "Container-Name",
|
||||
"port": "Port | Ports",
|
||||
"volume": "Volume | Volumes",
|
||||
"port": "Port / Ports",
|
||||
"volume": "Volume / Volumes",
|
||||
"network": "Netzwerk | Netzwerke",
|
||||
"dependsOn": "Container-Abhängigkeit | Container-Abhängigkeiten",
|
||||
"dependsOn": "Container-Abhängigkeit/en",
|
||||
"addListItem": "{0} hinzufügen",
|
||||
"deleteContainer": "Löschen",
|
||||
"addContainer": "Container hinzufügen",
|
||||
"addNetwork": "Netzwerk hinzufügen",
|
||||
"disableauth.message1": "Bist du sicher, dass du die <strong>Authentifizierung deaktivieren</strong> möchtest?",
|
||||
"disableauth.message1": "Bist du sicher, dass du die <strong>Anmeldung deaktivieren</strong> möchtest?",
|
||||
"disableauth.message2": "Es ist für Szenarien vorgesehen, <strong>in denen du beabsichtigst, eine Drittanbieter-Authentifizierung</strong> vor Dockge zu implementieren, wie zum Beispiel Cloudflare Access, Authelia oder andere Authentifizierungsmechanismen.",
|
||||
"passwordNotMatchMsg": "Das wiederholte Passwort stimmt nicht überein.",
|
||||
"autoGet": "Automatisch holen",
|
||||
"autoGet": "Automatisch laden",
|
||||
"add": "Hinzufügen",
|
||||
"Edit": "Bearbeiten",
|
||||
"applyToYAML": "Auf YAML anwenden",
|
||||
|
|
@ -64,8 +64,8 @@
|
|||
"Update Password": "Passwort aktualisieren",
|
||||
"Advanced": "Erweitert",
|
||||
"Please use this option carefully!": "Bitte verwende diese Option sorgfältig!",
|
||||
"Enable Auth": "Authentifizierung aktivieren",
|
||||
"Disable Auth": "Authentifizierung deaktivieren",
|
||||
"Enable Auth": "Anmeldung aktivieren",
|
||||
"Disable Auth": "Anmeldung deaktivieren",
|
||||
"I understand, please disable": "Ich verstehe, bitte deaktivieren",
|
||||
"Leave": "Verlassen",
|
||||
"Frontend Version": "Frontend Version",
|
||||
|
|
@ -90,5 +90,13 @@
|
|||
"Allowed commands:": "Zugelassene Befehle:",
|
||||
"Internal Networks": "Interne Netzwerke",
|
||||
"External Networks": "Externe Netzwerke",
|
||||
"No External Networks": "Keine externen Netzwerke"
|
||||
}
|
||||
"No External Networks": "Keine externen Netzwerke",
|
||||
"Cannot connect to the socket server.": "Keine Verbindung zum Socket Server.",
|
||||
"reverseProxyMsg1": "Wird ein Reverse Proxy genutzt?",
|
||||
"reconnecting...": "Erneuter Verbindungsaufbau…",
|
||||
"downStack": "Stoppen & Aus",
|
||||
"extra": "Extra",
|
||||
"url": "URL / URLs",
|
||||
"reverseProxyMsg2": "Lerne wie dieser für WebSockets zu konfigurieren ist.",
|
||||
"connecting...": "Verbindungsaufbau zum Socket Server…"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"registry": "Registry",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Compose your first stack!",
|
||||
"stackName" : "Stack Name",
|
||||
"stackName": "Stack Name",
|
||||
"deployStack": "Deploy",
|
||||
"deleteStack": "Delete",
|
||||
"stopStack": "Stop",
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
"editStack": "Edit",
|
||||
"discardStack": "Discard",
|
||||
"saveStackDraft": "Save",
|
||||
"notAvailableShort" : "N/A",
|
||||
"notAvailableShort": "N/A",
|
||||
"deleteStackMsg": "Are you sure you want to delete this stack?",
|
||||
"stackNotManagedByDockgeMsg": "This stack is not managed by Dockge.",
|
||||
"primaryHostname": "Primary Hostname",
|
||||
|
|
@ -95,8 +95,8 @@
|
|||
"reverseProxyMsg1": "Using a Reverse Proxy?",
|
||||
"reverseProxyMsg2": "Check how to config it for WebSocket",
|
||||
"Cannot connect to the socket server.": "Cannot connect to the socket server.",
|
||||
"reconnecting...": "Reconnecting...",
|
||||
"connecting...": "Connecting to the socket server...",
|
||||
"reconnecting...": "Reconnecting…",
|
||||
"connecting...": "Connecting to the socket server…",
|
||||
"url": "URL | URLs",
|
||||
"extra": "Extra"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"languageName": "Francais",
|
||||
"languageName": "Français",
|
||||
"Create your admin account": "Créez votre compte administrateur",
|
||||
"authIncorrectCreds": "identifiant ou mot de passe incorrect.",
|
||||
"Repeat Password": "Répéter le mot de passe",
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
"console": "Console",
|
||||
"registry": "Registre",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Créez votre première pile!",
|
||||
"stackName" : "Nom de la pile",
|
||||
"addFirstStackMsg": "Créez votre première pile !",
|
||||
"stackName": "Nom de la pile",
|
||||
"deployStack": "Déployer",
|
||||
"deleteStack": "Supprimer",
|
||||
"stopStack": "Arrêter",
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
"editStack": "Modifier",
|
||||
"discardStack": "Ignorer",
|
||||
"saveStackDraft": "Sauvegarder",
|
||||
"notAvailableShort" : "N/A",
|
||||
"notAvailableShort": "N/A",
|
||||
"deleteStackMsg": "Êtes-vous sûr de vouloir supprimer cette pile ?",
|
||||
"stackNotManagedByDockgeMsg": "Cette pile n'est pas gérée par Dockge.",
|
||||
"primaryHostname": "Nom d'hôte principal",
|
||||
"general": "Générale",
|
||||
"general": "Général",
|
||||
"container": "Conteneur | Conteneurs",
|
||||
"scanFolder": "Analyser le dossier des piles",
|
||||
"dockerImage": "Image",
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
"autoGet": "Obtention automatique",
|
||||
"add": "Ajouter",
|
||||
"Edit": "Modifier",
|
||||
"applyToYAML": "Appliquer à YAML",
|
||||
"applyToYAML": "Appliquer au YAML",
|
||||
"createExternalNetwork": "Créer",
|
||||
"addInternalNetwork": "Ajouter",
|
||||
"Save": "Enregistrer",
|
||||
|
|
@ -87,8 +87,16 @@
|
|||
"Appearance": "Apparence",
|
||||
"Security": "Sécurité",
|
||||
"About": "À propos",
|
||||
"Allowed commands:": "Commandes autorisées:",
|
||||
"Allowed commands:": "Commandes autorisées :",
|
||||
"Internal Networks": "Réseaux Internes",
|
||||
"External Networks": "Réseaux Externes",
|
||||
"No External Networks": "Aucun Réseau Externe"
|
||||
"No External Networks": "Aucun Réseau Externe",
|
||||
"reverseProxyMsg2": "Vérifier comment le configurer pour WebSocket",
|
||||
"connecting...": "Connexion au serveur socket…",
|
||||
"url": "URL | URLs",
|
||||
"extra": "Supplémentaire",
|
||||
"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…"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"registry": "Registro",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Componi il tuo primo stack!",
|
||||
"stackName" : "Nome dello stack",
|
||||
"stackName": "Nome dello stack",
|
||||
"deployStack": "Deploy",
|
||||
"deleteStack": "Cancella",
|
||||
"stopStack": "Stop",
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
"editStack": "Modifica",
|
||||
"discardStack": "Annulla",
|
||||
"saveStackDraft": "Salva",
|
||||
"notAvailableShort" : "N/D",
|
||||
"notAvailableShort": "N/D",
|
||||
"deleteStackMsg": "Sei sicuro di voler eliminare questo stack?",
|
||||
"stackNotManagedByDockgeMsg": "Questo stack non è gestito da Dockge.",
|
||||
"primaryHostname": "Hostname primario",
|
||||
|
|
@ -91,5 +91,11 @@
|
|||
"Allowed commands:": "Comandi permessi:",
|
||||
"Internal Networks": "Reti interne",
|
||||
"External Networks": "Reti esterne",
|
||||
"No External Networks": "Nessuna rete esterna"
|
||||
"No External Networks": "Nessuna rete esterna",
|
||||
"reverseProxyMsg1": "Utilizzando un proxy inverso?",
|
||||
"reverseProxyMsg2": "Controlla come configurarlo per WebSocket",
|
||||
"Cannot connect to the socket server.": "Impossibile connettersi al server socket.",
|
||||
"connecting...": "Connessione al server socket…",
|
||||
"extra": "Extra",
|
||||
"reconnecting...": "Riconnessione…"
|
||||
}
|
||||
|
|
|
|||
98
frontend/src/lang/ja.json
Normal file
98
frontend/src/lang/ja.json
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
{
|
||||
"authIncorrectCreds": "ユーザーネームまたはパスワードが正しくありません。",
|
||||
"PasswordsDoNotMatch": "パスワードが一致しません。",
|
||||
"Repeat Password": "パスワードを再度入力してください",
|
||||
"Create": "作成",
|
||||
"signedInDispDisabled": "認証が無効化されています。",
|
||||
"home": "ホーム",
|
||||
"console": "コンソール",
|
||||
"registry": "レジストリ",
|
||||
"stackName": "スタック名",
|
||||
"deployStack": "デプロイ",
|
||||
"deleteStack": "削除",
|
||||
"stopStack": "停止",
|
||||
"restartStack": "再起動",
|
||||
"updateStack": "更新",
|
||||
"startStack": "起動",
|
||||
"editStack": "編集",
|
||||
"discardStack": "破棄",
|
||||
"saveStackDraft": "保存",
|
||||
"stackNotManagedByDockgeMsg": "このスタックはDockgeによって管理されていません。",
|
||||
"general": "一般",
|
||||
"scanFolder": "スタックフォルダをスキャン",
|
||||
"dockerImage": "イメージ",
|
||||
"environmentVariable": "環境変数",
|
||||
"restartPolicy": "再起動ポリシー",
|
||||
"containerName": "コンテナ名",
|
||||
"port": "ポート",
|
||||
"volume": "ボリューム",
|
||||
"network": "ネットワーク",
|
||||
"addListItem": "{0} を追加",
|
||||
"addContainer": "コンテナを追加",
|
||||
"addNetwork": "ネットワークを追加",
|
||||
"compose": "Compose",
|
||||
"primaryHostname": "主ホスト名",
|
||||
"container": "コンテナ",
|
||||
"dependsOn": "コンテナ依存関係",
|
||||
"downStack": "停止して削除",
|
||||
"notAvailableShort": "N/A",
|
||||
"restartPolicyUnlessStopped": "手動で停止されるまで",
|
||||
"restartPolicyAlways": "常時",
|
||||
"restartPolicyOnFailure": "失敗時",
|
||||
"restartPolicyNo": "しない",
|
||||
"passwordNotMatchMsg": "繰り返しのパスワードが一致しません。",
|
||||
"autoGet": "自動取得",
|
||||
"add": "追加",
|
||||
"Edit": "編集",
|
||||
"applyToYAML": "YAMLに適用",
|
||||
"createExternalNetwork": "作成",
|
||||
"addInternalNetwork": "追加",
|
||||
"Save": "保存",
|
||||
"Language": "言語",
|
||||
"Change Password": "パスワードを変更する",
|
||||
"Current Password": "現在のパスワード",
|
||||
"New Password": "新しいパスワード",
|
||||
"Update Password": "パスワードを更新",
|
||||
"Advanced": "高度",
|
||||
"Please use this option carefully!": "このオプションは注意して使用してください！",
|
||||
"Enable Auth": "認証を有効化",
|
||||
"Disable Auth": "認証を無効化",
|
||||
"Check Update On GitHub": "GitHubで更新を確認",
|
||||
"Show update if available": "アップデートがある場合表示",
|
||||
"Also check beta release": "ベータ版のリリースも確認する",
|
||||
"Login": "ログイン",
|
||||
"Username": "ユーザー名",
|
||||
"Password": "パスワード",
|
||||
"Settings": "設定",
|
||||
"Logout": "ログアウト",
|
||||
"Convert to Compose": "Composeに変換",
|
||||
"Appearance": "外観",
|
||||
"Security": "セキュリティ",
|
||||
"Allowed commands:": "許可されたコマンド:",
|
||||
"Internal Networks": "内部ネットワーク",
|
||||
"External Networks": "外部ネットワーク",
|
||||
"reverseProxyMsg2": "WebSocketの設定方法を確認",
|
||||
"Cannot connect to the socket server.": "ソケットサーバーに接続できません。",
|
||||
"reconnecting...": "再接続中…",
|
||||
"Leave": "やめる",
|
||||
"Frontend Version": "フロントエンドバージョン",
|
||||
"Remember me": "覚えておく",
|
||||
"No External Networks": "外部ネットワークなし",
|
||||
"exited": "終了済み",
|
||||
"inactive": "非アクティブ",
|
||||
"active": "アクティブ",
|
||||
"languageName": "日本語",
|
||||
"Create your admin account": "管理者アカウントを作成してください",
|
||||
"signedInDisp": "{0} としてログイン中",
|
||||
"addFirstStackMsg": "最初のスタックを組み立てましょう！",
|
||||
"deleteStackMsg": "本当にこのスタックを削除しますか？",
|
||||
"deleteContainer": "削除",
|
||||
"disableauth.message1": "本当に<strong>認証を無効化</strong>しますか?",
|
||||
"disableauth.message2": "これはCloudflare AccessやAutheliaなどの認証手段をDockgeの前段に置いて<strong>サードパーティー認証を実装することをあなたが意図している</strong>場合のために設計されています。",
|
||||
"Current User": "現在のユーザー",
|
||||
"Repeat New Password": "新しいパスワードを繰り返してください",
|
||||
"I understand, please disable": "理解しました。無効化してください",
|
||||
"Lowercase only": "小文字のみ",
|
||||
"reverseProxyMsg1": "リバースプロキシを使用していますか？",
|
||||
"connecting...": "ソケットサーバーに接続中…"
|
||||
}
|
||||
|
|
@ -90,5 +90,13 @@
|
|||
"Allowed commands:": "허용된 명령어:",
|
||||
"Internal Networks": "내부 네트워크",
|
||||
"External Networks": "외부 네트워크",
|
||||
"No External Networks": "외부 네트워크 없음"
|
||||
"No External Networks": "외부 네트워크 없음",
|
||||
"reverseProxyMsg2": "여기서 WebSocket을 위한 설정을 확인해 보세요",
|
||||
"downStack": "정지 & Down",
|
||||
"reverseProxyMsg1": "리버스 프록시를 사용하고 계신가요?",
|
||||
"Cannot connect to the socket server.": "소켓 서버에 연결하지 못했습니다.",
|
||||
"connecting...": "소켓 서버에 연결하는 중…",
|
||||
"extra": "기타",
|
||||
"url": "URL | URL",
|
||||
"reconnecting...": "재연결 중…"
|
||||
}
|
||||
|
|
|
|||
102
frontend/src/lang/nl.json
Normal file
102
frontend/src/lang/nl.json
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
{
|
||||
"languageName": "Nederlands",
|
||||
"authIncorrectCreds": "Onjuiste gebruikersnaam of wachtwoord.",
|
||||
"PasswordsDoNotMatch": "Paswoorden komen niet overeen.",
|
||||
"Repeat Password": "Herhaal wachtwoord",
|
||||
"Create": "Aanmaken",
|
||||
"signedInDisp": "Ingelogd als {0}",
|
||||
"home": "Startpagina",
|
||||
"console": "Console",
|
||||
"registry": "Register",
|
||||
"compose": "Samenstellen",
|
||||
"stackName": "Stack naam",
|
||||
"deployStack": "Opzetten",
|
||||
"deleteStack": "Verwijder",
|
||||
"stopStack": "Stop",
|
||||
"restartStack": "Herstart",
|
||||
"updateStack": "Update",
|
||||
"startStack": "Start",
|
||||
"downStack": "Stop & Down",
|
||||
"editStack": "Bewerken",
|
||||
"discardStack": "Verwijderen",
|
||||
"saveStackDraft": "Opslaan",
|
||||
"notAvailableShort": "NVT",
|
||||
"stackNotManagedByDockgeMsg": "Deze stack wordt niet beheerd door Dockge.",
|
||||
"primaryHostname": "Primaire hostnaam",
|
||||
"general": "Algemeen",
|
||||
"scanFolder": "Scan stacks folder",
|
||||
"dockerImage": "Image",
|
||||
"restartPolicyUnlessStopped": "Tenzij gestopt",
|
||||
"restartPolicyAlways": "Altijd",
|
||||
"restartPolicyOnFailure": "Bij fout",
|
||||
"restartPolicyNo": "Neen",
|
||||
"environmentVariable": "Omgevings variabele(n)",
|
||||
"restartPolicy": "Herstart policy",
|
||||
"containerName": "Containernaam",
|
||||
"port": "Poort(en)",
|
||||
"volume": "Volume(s)",
|
||||
"network": "Netwerk(en)",
|
||||
"addListItem": "Voeg {0} toe",
|
||||
"deleteContainer": "Verwijder",
|
||||
"addContainer": "Container toevoegen",
|
||||
"addNetwork": "Netwerk toevoegen",
|
||||
"signedInDispDisabled": "Aanmelden uitgeschakeld.",
|
||||
"container": "Container(s)",
|
||||
"autoGet": "Auto ophalen",
|
||||
"add": "Toevoegen",
|
||||
"Edit": "Bewerken",
|
||||
"applyToYAML": "Toevoegen aan YAML",
|
||||
"createExternalNetwork": "Aanmaken",
|
||||
"addInternalNetwork": "Toevoegen",
|
||||
"Save": "Opslaan",
|
||||
"Language": "Taal",
|
||||
"Change Password": "Verander wachtwoord",
|
||||
"Current Password": "Huidig wachtwoord",
|
||||
"New Password": "Nieuw wachtwoord",
|
||||
"Repeat New Password": "Herhaal nieuw wachtwoord",
|
||||
"Update Password": "Update wachtwoord",
|
||||
"Advanced": "Geavanceerd",
|
||||
"I understand, please disable": "Begrepen, dit uitschakelen",
|
||||
"Disable Auth": "Aanmelden uitschakelen",
|
||||
"Enable Auth": "Aanmelden inschakelen",
|
||||
"Leave": "Afmelden",
|
||||
"Frontend Version": "Frontend versie",
|
||||
"Check Update On GitHub": "Controleer via GitHub op updates",
|
||||
"Show update if available": "Toon update indien beschikbaar",
|
||||
"Remember me": "Onthoud mij",
|
||||
"Login": "Inloggen",
|
||||
"Username": "Gebruikersnaam",
|
||||
"Password": "Wachtwoord",
|
||||
"Settings": "Instellingen",
|
||||
"Logout": "Uitloggen",
|
||||
"Lowercase only": "Geen hoofdletters",
|
||||
"Docker Run": "Docker run",
|
||||
"active": "actief",
|
||||
"exited": "gestopt",
|
||||
"inactive": "inactief",
|
||||
"Appearance": "Uiterlijk",
|
||||
"Security": "Beveiliging",
|
||||
"About": "Over",
|
||||
"Allowed commands:": "Toegelaten commando's:",
|
||||
"Internal Networks": "Interne netwerken",
|
||||
"No External Networks": "Geen externe netwerken",
|
||||
"reverseProxyMsg1": "Reverse proxy in gebruik?",
|
||||
"reverseProxyMsg2": "Controleer hoe te configureren voor WebSocket",
|
||||
"Cannot connect to the socket server.": "Kan geen verbinding maken met de socket server.",
|
||||
"reconnecting...": "Herverbinden...",
|
||||
"connecting...": "Verbinden met de socket server...",
|
||||
"url": "Url(s)",
|
||||
"extra": "Extra",
|
||||
"Create your admin account": "Creëer je beheerders-account",
|
||||
"addFirstStackMsg": "Maak je eerste stack!",
|
||||
"deleteStackMsg": "Zeker dat je deze stack wilt verwijderen?",
|
||||
"dependsOn": "Container afhankelijkheid | afhankelijkheden",
|
||||
"disableauth.message1": "Zeker dat u <strong>aanmelden</strong> wilt uitschakelen?",
|
||||
"disableauth.message2": "Dit is enkel bedoeld om te gebruiken wanneer je<strong> third-party autorisatie wilt gebruiken voor Dockge</strong>, zoals Cloudflare Acces, Authelia, ...",
|
||||
"passwordNotMatchMsg": "De wachtwoorden komen niet overeen.",
|
||||
"Current User": "Huidige gebruiker",
|
||||
"Please use this option carefully!": "Wees voorzichtig met deze optie!",
|
||||
"Also check beta release": "Controleer ook op beta releases",
|
||||
"Convert to Compose": "Converteer naar compose",
|
||||
"External Networks": "Externe netwerken"
|
||||
}
|
||||
102
frontend/src/lang/ro.json
Normal file
102
frontend/src/lang/ro.json
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
{
|
||||
"Create your admin account": "Creați-vă contul de administrator",
|
||||
"PasswordsDoNotMatch": "Parolele nu se potrivesc.",
|
||||
"Repeat Password": "Repetați parola",
|
||||
"signedInDisp": "Conectat ca {0}",
|
||||
"signedInDispDisabled": "Autentificare dezactivată.",
|
||||
"Create": "Creează",
|
||||
"home": "Acasă",
|
||||
"console": "Consolă",
|
||||
"registry": "Registru",
|
||||
"compose": "Compune",
|
||||
"addFirstStackMsg": "Compune prima ta stivă!",
|
||||
"stackName": "Nume stivă",
|
||||
"deployStack": "Lansează",
|
||||
"deleteStack": "Șterge",
|
||||
"stopStack": "Oprește",
|
||||
"restartStack": "Repornire",
|
||||
"updateStack": "Actualizare",
|
||||
"languageName": "Română",
|
||||
"authIncorrectCreds": "Numele de utilizator sau parola incorectă.",
|
||||
"startStack": "Pornește",
|
||||
"editStack": "Editați",
|
||||
"discardStack": "Renunţa",
|
||||
"notAvailableShort": "N/A",
|
||||
"deleteStackMsg": "Sigur doriți să ștergeți această stivă?",
|
||||
"stackNotManagedByDockgeMsg": "Această stivă nu este gestionată de Dockge.",
|
||||
"primaryHostname": "Numele gazdei principale",
|
||||
"general": "General",
|
||||
"container": "Container | Containere",
|
||||
"scanFolder": "Scanează folderul cu stive",
|
||||
"dockerImage": "Imagine",
|
||||
"restartPolicyOnFailure": "La Defecţiune",
|
||||
"restartPolicyNo": "Nu",
|
||||
"restartPolicy": "Politica de repornire",
|
||||
"restartPolicyAlways": "Mereu",
|
||||
"containerName": "Numele Containerului",
|
||||
"port": "Port | Porturi",
|
||||
"volume": "Volum | Volume",
|
||||
"network": "Reţea | Reţele",
|
||||
"dependsOn": "Dependența containerului | Dependențele containerelor",
|
||||
"addListItem": "Adaugă {0}",
|
||||
"deleteContainer": "Șterge",
|
||||
"addContainer": "Adaugă Container",
|
||||
"addNetwork": "Adaugă Rețea",
|
||||
"addInternalNetwork": "Adaugă",
|
||||
"Save": "Salvează",
|
||||
"Current User": "Utilizator Curent",
|
||||
"Change Password": "Schimbă Parola",
|
||||
"Current Password": "Parolă Curenta",
|
||||
"New Password": "Parolă Nouă",
|
||||
"Repeat New Password": "Repetă Parola Nouă",
|
||||
"Update Password": "Actualizează Parola",
|
||||
"Advanced": "Avansat",
|
||||
"Enable Auth": "Activați Autentificarea",
|
||||
"Disable Auth": "Dezactivați Autentificarea",
|
||||
"I understand, please disable": "Am înțeles, vă rog dezactivați",
|
||||
"Leave": "Părăsiți",
|
||||
"Frontend Version": "Versiunea Frontend",
|
||||
"Check Update On GitHub": "Verificați actualizarea pe GitHub",
|
||||
"Also check beta release": "Verificați și versiunea beta",
|
||||
"Remember me": "Ține-mă minte",
|
||||
"Login": "Autentificare",
|
||||
"Username": "Nume de utilizator",
|
||||
"Password": "Parolă",
|
||||
"passwordNotMatchMsg": "Parola repetată nu se potrivește.",
|
||||
"autoGet": "Obținere automată",
|
||||
"add": "Adăuga",
|
||||
"Edit": "Editați",
|
||||
"applyToYAML": "Aplicați la YAML",
|
||||
"createExternalNetwork": "Creează",
|
||||
"Settings": "Setări",
|
||||
"Logout": "Deconectare",
|
||||
"Lowercase only": "Doar litere mici",
|
||||
"Convert to Compose": "Convertiți în Compose",
|
||||
"Docker Run": "Docker Run",
|
||||
"active": "activ",
|
||||
"exited": "ieșit",
|
||||
"inactive": "inactiv",
|
||||
"Appearance": "Aspect",
|
||||
"Security": "Securitate",
|
||||
"About": "Despre",
|
||||
"Allowed commands:": "Comenzi permise:",
|
||||
"Internal Networks": "Rețele interne",
|
||||
"External Networks": "Rețele externe",
|
||||
"No External Networks": "Fără rețele externe",
|
||||
"reverseProxyMsg1": "Folosești un proxy invers?",
|
||||
"reverseProxyMsg2": "Verificați cum să-l configurați pentru WebSocket",
|
||||
"Cannot connect to the socket server.": "Nu se poate conecta la serverul socket.",
|
||||
"reconnecting...": "Reconectare...",
|
||||
"connecting...": "Se conectează la serverul socket...",
|
||||
"url": "URL | URLs",
|
||||
"extra": "Suplimentar",
|
||||
"downStack": "Opriți & Coborâți",
|
||||
"saveStackDraft": "Salvați",
|
||||
"restartPolicyUnlessStopped": "Dacă nu este oprit",
|
||||
"environmentVariable": "Variabila de mediu | Variabile de mediu",
|
||||
"Language": "Limbă",
|
||||
"Please use this option carefully!": "Vă rugăm să utilizați această opțiune cu atenție!",
|
||||
"Show update if available": "Afișează actualizarea dacă este disponibilă",
|
||||
"disableauth.message1": "Sigur doriți să <strong>dezactivați autentificarea</strong>?",
|
||||
"disableauth.message2": "Este conceput pentru scenarii <strong>în care intenționați să implementați autentificarea terță</strong> în fața Dockge-lui, cum ar fi Cloudflare Access, Authelia sau alte mecanisme de autentificare."
|
||||
}
|
||||
|
|
@ -5,14 +5,14 @@
|
|||
"PasswordsDoNotMatch": "Пароль не совпадает.",
|
||||
"Repeat Password": "Повторите пароль",
|
||||
"Create": "Создать",
|
||||
"signedInDisp": "Авторизлван как {0}",
|
||||
"signedInDisp": "Авторизован как",
|
||||
"signedInDispDisabled": "Авторизация выключена.",
|
||||
"home": "Главная",
|
||||
"console": "Консоль",
|
||||
"registry": "Registry",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Создайте свой первый стек!",
|
||||
"stackName" : "Имя стека",
|
||||
"stackName": "Имя стека",
|
||||
"deployStack": "Развернуть",
|
||||
"deleteStack": "Удалить",
|
||||
"stopStack": "Остановить",
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"editStack": "Изменить",
|
||||
"discardStack": "Отменить",
|
||||
"saveStackDraft": "Сохранить",
|
||||
"notAvailableShort" : "Н/Д",
|
||||
"notAvailableShort": "Н/Д",
|
||||
"deleteStackMsg": "Вы уверены что хотите удалить этот стек?",
|
||||
"stackNotManagedByDockgeMsg": "Данный стек не обслуживается Dockge.",
|
||||
"primaryHostname": "Имя хоста",
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
"Settings": "Настройки",
|
||||
"Logout": "Выйти",
|
||||
"Lowercase only": "Только нижний регистр",
|
||||
"Convert to Compose": "Преобразовать вCompose",
|
||||
"Convert to Compose": "Преобразовать в Compose",
|
||||
"Docker Run": "Запустить Docker",
|
||||
"active": "активный",
|
||||
"exited": "завершенный",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"registry": "Kayıt Defteri",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "İlk yığınınızı oluşturun!",
|
||||
"stackName" : "Yığın Adı",
|
||||
"stackName": "Yığın Adı",
|
||||
"deployStack": "Dağıtmak",
|
||||
"deleteStack": "Sil",
|
||||
"stopStack": "Dudur",
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"editStack": "Düzenle",
|
||||
"discardStack": "Çıkar",
|
||||
"saveStackDraft": "Kaydet",
|
||||
"notAvailableShort" : "N/A",
|
||||
"notAvailableShort": "N/A",
|
||||
"deleteStackMsg": "Bu yığını silmek istediğinizden emin misiniz?",
|
||||
"stackNotManagedByDockgeMsg": "Bu yığın Dockge tarafından yönetilmemektedir.",
|
||||
"primaryHostname": "Birincil Ana Bilgisayar Adı",
|
||||
|
|
@ -90,5 +90,13 @@
|
|||
"Allowed commands:": "İzin verilen komutlar:",
|
||||
"Internal Networks": "İç Ağlar",
|
||||
"External Networks": "Dış Ağlar",
|
||||
"No External Networks": "Dış Ağ Yok"
|
||||
"No External Networks": "Dış Ağ Yok",
|
||||
"extra": "Ekstra",
|
||||
"reverseProxyMsg1": "Ters Proxy mi kullanıyorsunuz?",
|
||||
"reverseProxyMsg2": "WebSocket için nasıl yapılandırma yapılacağını kontrol edin",
|
||||
"reconnecting...": "Yeniden bağlanıyor…",
|
||||
"connecting...": "Soket sunucusuna bağlanıyor…",
|
||||
"url": "URL | URL’ler",
|
||||
"Cannot connect to the socket server.": "Soket sunucusuna bağlanılamıyor.",
|
||||
"downStack": "Durdur & Kapat"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"languageName": "Українська",
|
||||
"Create your admin account": "Створити акаунт адміністратора",
|
||||
"authIncorrectCreds": "Невірний логін чи пароль",
|
||||
"PasswordsDoNotMatch": "Паролі не співпадають.",
|
||||
"authIncorrectCreds": "Неправильне ім'я користувача або пароль.",
|
||||
"PasswordsDoNotMatch": "Паролі не збігаються.",
|
||||
"Repeat Password": "Повторіть пароль",
|
||||
"Create": "Створити",
|
||||
"signedInDisp": "Авторизовано як {0}",
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
"registry": "Registry",
|
||||
"compose": "Compose",
|
||||
"addFirstStackMsg": "Додайте свій перший стек!",
|
||||
"stackName" : "Назва стеку",
|
||||
"deployStack": "Розрознути",
|
||||
"stackName": "Назва стеку",
|
||||
"deployStack": "Розгорнути",
|
||||
"deleteStack": "Видалити",
|
||||
"stopStack": "Зупинити",
|
||||
"restartStack": "Перезапустити",
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"editStack": "Редагувати",
|
||||
"discardStack": "Відмінити",
|
||||
"saveStackDraft": "Зберегти",
|
||||
"notAvailableShort" : "Н/Д",
|
||||
"notAvailableShort": "Н/Д",
|
||||
"deleteStackMsg": "Ви впевнені що хочете видалити цей стек?",
|
||||
"stackNotManagedByDockgeMsg": "Даний стек не управляється Dockge.",
|
||||
"primaryHostname": "Назва хосту",
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
"addNetwork": "Додати Мережу",
|
||||
"disableauth.message1": "Ви впевнені що хочете <strong>вимкнути авторизацію</strong>?",
|
||||
"disableauth.message2": "Це призначено для сценаріїв, <strong>де ви збираєтесь використати сторонню авторизацію</strong> перед Dockge, наприклад Cloudflare Access, Authelia чи інші.",
|
||||
"passwordNotMatchMsg": "Паролі не співпадають.",
|
||||
"passwordNotMatchMsg": "Повторення паролю не збігається.",
|
||||
"autoGet": "Отримати",
|
||||
"add": "Додати",
|
||||
"Edit": "Змінити",
|
||||
|
|
@ -63,10 +63,10 @@
|
|||
"Repeat New Password": "Повторіть новий пароль",
|
||||
"Update Password": "Оновити пароль",
|
||||
"Advanced": "Розширені опції",
|
||||
"Please use this option carefully!": "Будь-ласка, використовуйте цю опцію з обережністю!",
|
||||
"Please use this option carefully!": "Будь ласка, використовуйте цю опцію з обережністю!",
|
||||
"Enable Auth": "Увімкнути автентифікацію",
|
||||
"Disable Auth": "Вимкнути автентифікацію",
|
||||
"I understand, please disable": "Зрозуміло, все-одно вимкнути",
|
||||
"I understand, please disable": "Зрозуміло, все одно вимкнути",
|
||||
"Leave": "Покинути",
|
||||
"Frontend Version": "Версія інтерфейсу",
|
||||
"Check Update On GitHub": "Перевірити оновлення на GitHub",
|
||||
|
|
@ -90,5 +90,13 @@
|
|||
"Allowed commands:": "Дозволені команди:",
|
||||
"Internal Networks": "Внутрішні мережі",
|
||||
"External Networks": "Зовнішні мережі",
|
||||
"No External Networks": "Немає зовнішніх мереж"
|
||||
"No External Networks": "Немає зовнішніх мереж",
|
||||
"downStack": "Зупинити і вимкнути",
|
||||
"reverseProxyMsg1": "Використовувати зворотній проксі?",
|
||||
"Cannot connect to the socket server.": "Не вдається підключитися до сервера сокетів.",
|
||||
"reconnecting...": "Повторне підключення…",
|
||||
"connecting...": "Підключення до сервера сокетів…",
|
||||
"url": "URL-адреса | URL-адреси",
|
||||
"reverseProxyMsg2": "Перевірте, як налаштувати його для WebSocket",
|
||||
"extra": "Додатково"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
"stopStack": "روکو",
|
||||
"restartStack": "دوبارہ شروع کریں",
|
||||
"updateStack": "اپ ڈیٹ",
|
||||
"startStack": "شروع کریں۔",
|
||||
"startStack": "شروع کریں",
|
||||
"editStack": "ترمیم",
|
||||
"discardStack": "رد کر دیں۔",
|
||||
"discardStack": "رد کر دیں",
|
||||
"saveStackDraft": "محفوظ کریں۔",
|
||||
"notAvailableShort": "N / A",
|
||||
"deleteStackMsg": "کیا آپ واقعی اس اسٹیک کو حذف کرنا چاہتے ہیں؟",
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
"primaryHostname": "بنیادی میزبان نام",
|
||||
"general": "جنرل",
|
||||
"container": "کنٹینر | کنٹینرز",
|
||||
"scanFolder": "اسٹیک فولڈر کو اسکین کریں۔",
|
||||
"scanFolder": "اسٹیک فولڈر کو اسکین کریں",
|
||||
"dockerImage": "تصویر",
|
||||
"restartPolicyUnlessStopped": "جب تک روکا نہیں جاتا",
|
||||
"restartPolicyAlways": "ہمیشہ",
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
"autoGet": "آٹو حاصل کریں",
|
||||
"add": "شامل کریں",
|
||||
"Edit": "ترمیم",
|
||||
"applyToYAML": "YAML پر درخواست دیں۔",
|
||||
"applyToYAML": "YAML پر درخواست دیں",
|
||||
"createExternalNetwork": "بنانا",
|
||||
"addInternalNetwork": "شامل کریں",
|
||||
"Save": "محفوظ کریں",
|
||||
|
|
@ -64,12 +64,12 @@
|
|||
"Update Password": "پاس ورڈ اپ ڈیٹ کریں",
|
||||
"Advanced": "ترقی یافتہ",
|
||||
"Please use this option carefully!": "براہ کرم اس اختیار کو احتیاط سے استعمال کریں!",
|
||||
"Enable Auth": "تصدیق کو فعال کریں۔",
|
||||
"Disable Auth": "توثیق کو غیر فعال کریں۔",
|
||||
"I understand, please disable": "میں سمجھتا ہوں، براہ کرم غیر فعال کریں۔",
|
||||
"Enable Auth": "تصدیق کو فعال کریں",
|
||||
"Disable Auth": "توثیق کو غیر فعال کریں",
|
||||
"I understand, please disable": "میں سمجھتا ہوں، براہ کرم غیر فعال کریں",
|
||||
"Leave": "چھوڑ دو",
|
||||
"Frontend Version": "فرنٹ اینڈ ورژن",
|
||||
"Check Update On GitHub": "گیتوب پر اپ ڈیٹ چیک کریں۔",
|
||||
"Check Update On GitHub": "گیتوب پر اپ ڈیٹ چیک کریں",
|
||||
"Show update if available": "اگر دستیاب ہو تو اپ ڈیٹ دکھائیں",
|
||||
"Also check beta release": "بیٹا ریلیز بھی چیک کریں",
|
||||
"Remember me": "مجھے پہچانتے ہو",
|
||||
|
|
@ -93,8 +93,8 @@
|
|||
"No External Networks": "کوئی بیرونی نیٹ ورک نہیں",
|
||||
"reverseProxyMsg1": "ایک ریورس پراکسی کا استعمال کرتے ہوئے؟",
|
||||
"Cannot connect to the socket server.": "ساکٹ سرور سے منسلک نہیں ہو سکتا۔",
|
||||
"reconnecting...": "دوبارہ منسلک ہو رہا ہے...",
|
||||
"connecting...": "ساکٹ سرور سے منسلک ہو رہا ہے...",
|
||||
"reconnecting...": "دوبارہ منسلک ہو رہا ہے…",
|
||||
"connecting...": "ساکٹ سرور سے منسلک ہو رہا ہے…",
|
||||
"url": "یو آر ایل | یو آر ایل",
|
||||
"extra": "اضافی",
|
||||
"downStack": "اسٹاپ اینڈ ڈاؤن",
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"languageName": "简体中文",
|
||||
"Create your admin account": "创建你的管理员账号",
|
||||
"authIncorrectCreds": "用户名或密码错误",
|
||||
"authIncorrectCreds": "用户名或密码错误。",
|
||||
"PasswordsDoNotMatch": "两次输入的密码不一致。",
|
||||
"Repeat Password": "重复以确认密码",
|
||||
"Create": "创建",
|
||||
"signedInDisp": "当前用户： {0}",
|
||||
"signedInDispDisabled": "已禁用身份验证",
|
||||
"signedInDispDisabled": "已禁用身份验证。",
|
||||
"home": "主页",
|
||||
"console": "终端",
|
||||
"registry": "镜像仓库",
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"saveStackDraft": "保存",
|
||||
"notAvailableShort": "不可用",
|
||||
"deleteStackMsg": "你确定要删除这个堆栈吗?",
|
||||
"stackNotManagedByDockgeMsg": "这个堆栈不由Dockge管理",
|
||||
"stackNotManagedByDockgeMsg": "这个堆栈不由Dockge管理。",
|
||||
"primaryHostname": "主机名",
|
||||
"general": "常规",
|
||||
"container": "容器 | 容器组",
|
||||
|
|
@ -91,9 +91,12 @@
|
|||
"Internal Networks": "内部网络",
|
||||
"External Networks": "外部网络",
|
||||
"No External Networks": "无外部网络",
|
||||
"reconnecting...": "重连中...",
|
||||
"reconnecting...": "重连中…",
|
||||
"reverseProxyMsg2": "检查如何配置WebSocket",
|
||||
"reverseProxyMsg1": "正在使用反向代理？",
|
||||
"connecting...": "正在连接到socket服务器...",
|
||||
"Cannot connect to the socket server.": "无法连接到socket服务器。"
|
||||
"connecting...": "正在连接到socket服务器…",
|
||||
"Cannot connect to the socket server.": "无法连接到socket服务器。",
|
||||
"url": "网址 | 网址",
|
||||
"extra": "额外",
|
||||
"downStack": "停止并删除"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"languageName": "繁體中文(台灣)",
|
||||
"Create your admin account": "建立您的管理員帳號",
|
||||
"authIncorrectCreds": "使用者名稱或密碼錯誤",
|
||||
"authIncorrectCreds": "使用者名稱或密碼錯誤。",
|
||||
"PasswordsDoNotMatch": "兩次輸入的密碼不一致。",
|
||||
"Repeat Password": "重複以確認密碼",
|
||||
"Create": "建立",
|
||||
"signedInDisp": "目前使用者：{0}",
|
||||
"signedInDispDisabled": "已停用身份驗證",
|
||||
"signedInDispDisabled": "已停用身份驗證。",
|
||||
"home": "首頁",
|
||||
"console": "主控台",
|
||||
"registry": "映像倉庫",
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"saveStackDraft": "儲存",
|
||||
"notAvailableShort": "不可用",
|
||||
"deleteStackMsg": "您確定要刪除這個堆疊嗎？",
|
||||
"stackNotManagedByDockgeMsg": "這個堆疊不由 Dockge 管理",
|
||||
"stackNotManagedByDockgeMsg": "這個堆疊不由 Dockge 管理。",
|
||||
"primaryHostname": "主機名稱",
|
||||
"general": "一般",
|
||||
"container": "容器 | 容器群組",
|
||||
|
|
@ -90,5 +90,13 @@
|
|||
"Allowed commands:": "允許使用的指令:",
|
||||
"Internal Networks": "內部網路",
|
||||
"External Networks": "外部網路",
|
||||
"No External Networks": "無外部網路"
|
||||
"No External Networks": "無外部網路",
|
||||
"downStack": "停止",
|
||||
"reverseProxyMsg1": "在使用反向代理吗？",
|
||||
"reverseProxyMsg2": "點擊這裡了解如何為 WebSocket 配置反向代理",
|
||||
"Cannot connect to the socket server.": "無法連接到 Socket 伺服器。",
|
||||
"reconnecting...": "重新連線中…",
|
||||
"connecting...": "連線至 Socket 伺服器中…",
|
||||
"url": "網址 | 網址",
|
||||
"extra": "額外"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@
|
|||
ref="editor"
|
||||
v-model="stack.composeYAML"
|
||||
class="yaml-editor"
|
||||
:highlight="highlighter"
|
||||
:highlight="highlighterYAML"
|
||||
line-numbers :readonly="!isEditMode"
|
||||
@input="yamlCodeChange"
|
||||
@focus="editorFocus = true"
|
||||
|
|
@ -165,6 +165,22 @@
|
|||
{{ yamlError }}
|
||||
</div>
|
||||
|
||||
<!-- ENV editor -->
|
||||
<div v-if="isEditMode">
|
||||
<h4 class="mb-3">.env</h4>
|
||||
<div class="shadow-box mb-3 editor-box" :class="{'edit-mode' : isEditMode}">
|
||||
<prism-editor
|
||||
ref="editor"
|
||||
v-model="stack.composeENV"
|
||||
class="env-editor"
|
||||
:highlight="highlighterENV"
|
||||
line-numbers :readonly="!isEditMode"
|
||||
@focus="editorFocus = true"
|
||||
@blur="editorFocus = false"
|
||||
></prism-editor>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="isEditMode">
|
||||
<!-- Volumes -->
|
||||
<div v-if="false">
|
||||
|
|
@ -232,10 +248,16 @@ services:
|
|||
ports:
|
||||
- "8080:80"
|
||||
`;
|
||||
const envDefault = "# VARIABLE=value #comment";
|
||||
|
||||
let yamlErrorTimeout = null;
|
||||
|
||||
let serviceStatusTimeout = null;
|
||||
let prismjsSymbolDefinition = {
|
||||
"symbol": {
|
||||
pattern: /(?<!\$)\$(\{[^{}]*\}|\w+)/,
|
||||
}
|
||||
};
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -381,19 +403,26 @@ export default {
|
|||
this.isEditMode = true;
|
||||
|
||||
let composeYAML;
|
||||
let composeENV;
|
||||
|
||||
if (this.$root.composeTemplate) {
|
||||
composeYAML = this.$root.composeTemplate;
|
||||
this.$root.composeTemplate = "";
|
||||
|
||||
} else {
|
||||
composeYAML = template;
|
||||
}
|
||||
if (this.$root.envTemplate) {
|
||||
composeENV = this.$root.envTemplate;
|
||||
this.$root.envTemplate = "";
|
||||
} else {
|
||||
composeENV = envDefault;
|
||||
}
|
||||
|
||||
// Default Values
|
||||
this.stack = {
|
||||
name: "",
|
||||
composeYAML,
|
||||
composeENV,
|
||||
isManagedByDockge: true,
|
||||
};
|
||||
|
||||
|
|
@ -499,7 +528,7 @@ export default {
|
|||
|
||||
this.bindTerminal(this.terminalName);
|
||||
|
||||
this.$root.getSocket().emit("deployStack", this.stack.name, this.stack.composeYAML, this.isAdd, (res) => {
|
||||
this.$root.getSocket().emit("deployStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
|
||||
this.processing = false;
|
||||
this.$root.toastRes(res);
|
||||
|
||||
|
|
@ -513,7 +542,7 @@ export default {
|
|||
saveStack() {
|
||||
this.processing = true;
|
||||
|
||||
this.$root.getSocket().emit("saveStack", this.stack.name, this.stack.composeYAML, this.isAdd, (res) => {
|
||||
this.$root.getSocket().emit("saveStack", this.stack.name, this.stack.composeYAML, this.stack.composeENV, this.isAdd, (res) => {
|
||||
this.processing = false;
|
||||
this.$root.toastRes(res);
|
||||
|
||||
|
|
@ -583,8 +612,44 @@ export default {
|
|||
this.isEditMode = false;
|
||||
},
|
||||
|
||||
highlighter(code) {
|
||||
return highlight(code, languages.yaml);
|
||||
highlighterYAML(code) {
|
||||
if (!languages.yaml_with_symbols) {
|
||||
languages.yaml_with_symbols = languages.insertBefore("yaml", "punctuation", {
|
||||
"symbol": prismjsSymbolDefinition["symbol"]
|
||||
});
|
||||
}
|
||||
return highlight(code, languages.yaml_with_symbols);
|
||||
},
|
||||
|
||||
highlighterENV(code) {
|
||||
if (!languages.docker_env) {
|
||||
languages.docker_env = {
|
||||
"comment": {
|
||||
pattern: /(^#| #).*$/m,
|
||||
greedy: true
|
||||
},
|
||||
"keyword": {
|
||||
pattern: /^[^ :=]*(?=[:=])/m,
|
||||
greedy: true
|
||||
},
|
||||
"value": {
|
||||
pattern: /(?<=[:=]).*?((?= #)|$)/m,
|
||||
greedy: true,
|
||||
inside: {
|
||||
"string": [
|
||||
{
|
||||
pattern: /^ *'.*?(?<!\\)'/m,
|
||||
},
|
||||
{
|
||||
pattern: /^ *".*?(?<!\\)"|^.*$/m,
|
||||
inside: prismjsSymbolDefinition
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
return highlight(code, languages.docker_env);
|
||||
},
|
||||
|
||||
yamlCodeChange() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "dockge",
|
||||
"version": "1.2.0",
|
||||
"version": "1.3.2",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">= 18.0.0 && <= 18.17.1"
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
"composerize": "~1.4.1",
|
||||
"croner": "~7.0.5",
|
||||
"dayjs": "~1.11.10",
|
||||
"dotenv": "^16.3.1",
|
||||
"dotenv": "~16.3.1",
|
||||
"express": "~4.18.2",
|
||||
"express-static-gzip": "~2.1.7",
|
||||
"http-graceful-shutdown": "~3.1.13",
|
||||
|
|
@ -42,6 +42,7 @@
|
|||
"knex": "~2.5.1",
|
||||
"limiter-es6-compat": "~2.1.2",
|
||||
"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",
|
||||
|
|
|
|||
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
|
|
@ -33,7 +33,7 @@ dependencies:
|
|||
specifier: ~1.11.10
|
||||
version: 1.11.10
|
||||
dotenv:
|
||||
specifier: ^16.3.1
|
||||
specifier: ~16.3.1
|
||||
version: 16.3.1
|
||||
express:
|
||||
specifier: ~4.18.2
|
||||
|
|
@ -59,6 +59,9 @@ dependencies:
|
|||
mysql2:
|
||||
specifier: ~3.6.3
|
||||
version: 3.6.3
|
||||
promisify-child-process:
|
||||
specifier: ~4.1.2
|
||||
version: 4.1.2
|
||||
redbean-node:
|
||||
specifier: ~0.3.3
|
||||
version: 0.3.3(mysql2@3.6.3)
|
||||
|
|
@ -3895,6 +3898,11 @@ packages:
|
|||
dev: false
|
||||
optional: true
|
||||
|
||||
/promisify-child-process@4.1.2:
|
||||
resolution: {integrity: sha512-APnkIgmaHNJpkAn7k+CrJSi9WMuff5ctYFbD0CO2XIPkM8yO7d/ShouU2clywbpHV/DUsyc4bpJCsNgddNtx4g==}
|
||||
engines: {node: '>=8'}
|
||||
dev: false
|
||||
|
||||
/proxy-addr@2.0.7:
|
||||
resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
|
||||
engines: {node: '>= 0.10'}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue