ric/dockge
1
0
Fork 0
mirror of https://github.com/louislam/dockge.git synced 2024-12-01 06:34:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Louis Lam 2023-11-06 16:00:20 +08:00
parent 2ed739b1b9
commit d7f4873405
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/components/Container.vue
View file

@ -172,6 +172,9 @@ export default defineComponent({
}, },
service() { service() {
if (!this.jsonObject.services[this.name]) {
return {};
}
return this.jsonObject.services[this.name]; return this.jsonObject.services[this.name];
}, },

43
frontend/src/pages/Compose.vue
View file

@ -372,12 +372,21 @@ export default {
return; return;
} }
// Check if services is object
if (typeof this.jsonConfig.services !== "object") {
this.$root.toastError("Services must be an object");
this.processing = false;
return;
}
let serviceNameList = Object.keys(this.jsonConfig.services);
// Set the stack name if empty, use the first container name // Set the stack name if empty, use the first container name
if (!this.stack.name) { if (!this.stack.name && serviceNameList.length > 0) {
let serviceName = Object.keys(this.jsonConfig.services)[0]; let serviceName = serviceNameList[0];
let service = this.jsonConfig.services[serviceName]; let service = this.jsonConfig.services[serviceName];
if (service.container_name) { if (service && service.container_name) {
this.stack.name = service.container_name; this.stack.name = service.container_name;
} else { } else {
this.stack.name = serviceName; this.stack.name = serviceName;
@ -472,18 +481,24 @@ export default {
throw doc.errors[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");
}
if (!config.version) {
config.version = "3.8";
}
this.yamlDoc = doc; this.yamlDoc = doc;
console.log(this.yamlDoc); this.jsonConfig = config;
this.jsonConfig = doc.toJS() ?? {};
if (!this.jsonConfig.version) {
this.jsonConfig.version = "3.8";
}
if (!this.jsonConfig.services) {
this.jsonConfig.services = {};
}
clearTimeout(yamlErrorTimeout); clearTimeout(yamlErrorTimeout);
this.yamlError = ""; this.yamlError = "";