From c6ce67f8675e2e23c1897852622ba88098b8b332 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 1 Feb 2023 16:00:59 +0800 Subject: [PATCH] Revert "Handle additional directories for Docker" This reverts commit fac07ceeb4c9cb14477326c7891f8f5c7fc02254. --- .../docker/configurator-docker.component.html | 2 +- .../docker/configurator-docker.component.ts | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html index 7472c334..15c42a25 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html @@ -110,7 +110,7 @@
Additional volumes
- + diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index c94d0466..1de27d76 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -55,16 +55,9 @@ export class ConfiguratorDialogDockerComponent implements OnInit { this.name = node.name; this.getConfiguration(); if (!this.node.properties.cpus) this.node.properties.cpus = 0.0; - if (this.node.properties.extra_volumes && this.node.properties.extra_volumes.length>0) { - for (let index = 0; index < this.node.properties.extra_volumes.length - 1; index++) { - this.additionalDirectories = this.additionalDirectories + this.node.properties.extra_volumes[index] + "\n"; - } - this.additionalDirectories = this.additionalDirectories + this.node.properties.extra_volumes[this.node.properties.extra_volumes.length - 1]; - } }); } - getConfiguration() { this.consoleTypes = this.dockerConfigurationService.getConsoleTypes(); } @@ -84,16 +77,7 @@ export class ConfiguratorDialogDockerComponent implements OnInit { } onSaveClick() { - var extraVolumes = this.additionalDirectories.split("\n").filter(elem => elem != ""); - for (const item of extraVolumes) { - console.log(item); - if (!item.startsWith("/")) { - this.toasterService.error(`Wrong format for additional directories.`); - return; - } - } if (this.generalSettingsForm.valid) { - this.node.properties.extra_volumes = extraVolumes; this.nodeService.updateNode(this.controller, this.node).subscribe(() => { this.toasterService.success(`Node ${this.node.name} updated.`); this.onCancelClick();