Try SSH from Docker

aceberg · Feb 26, 2025 · 9b54aa6 · 9b54aa6
1 parent 0a28202
commit 9b54aa6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/backend/internal/models/models.go b/backend/internal/models/models.go
@@ -37,4 +37,5 @@ type TypeStruct struct {
 	State   string
 	Mem     string
 	CPU     string
+	SSH     string
 }
diff --git a/backend/internal/service/exec.go b/backend/internal/service/exec.go
@@ -20,6 +20,11 @@ func Exec(item models.Item, typesMap map[string]map[string]string) (bool, string
 
 			str = strings.Replace(str, "$ITEMNAME", item.Name, -1)
 
+			ssh := t["SSH"]
+			if ssh != "" {
+				str = ssh + " " + str
+			}
+
 			log.Println("EXEC:", str)
 			cmd := exec.Command("sh", "-c", str)
 

diff --git a/backend/internal/web/functions.go b/backend/internal/web/functions.go
@@ -20,6 +20,7 @@ func typesToStruct(types map[string]map[string]string) (typeStructArray []models
 		oneStruct.State = value["State"]
 		oneStruct.Mem = value["Mem"]
 		oneStruct.CPU = value["CPU"]
+		oneStruct.SSH = value["SSH"]
 
 		typeStructArray = append(typeStructArray, oneStruct)
 	}
@@ -38,6 +39,7 @@ func toOneType(tStruct models.TypeStruct) (tmpMap map[string]string) {
 	tmpMap["State"] = tStruct.State
 	tmpMap["Mem"] = tStruct.Mem
 	tmpMap["CPU"] = tStruct.CPU
+	tmpMap["SSH"] = tStruct.SSH
 
 	return tmpMap
 }

diff --git a/backend/internal/web/public/assets/index.js b/backend/internal/web/public/assets/index.js
diff --git a/frontend/src/components/TypeAdd.tsx b/frontend/src/components/TypeAdd.tsx
@@ -12,6 +12,7 @@ function TypeAdd(_props:any) {
     State: "",
     CPU: "",
     Mem: "",
+    SSH: "",
   }
 
   return (

diff --git a/frontend/src/components/TypeEdit.tsx b/frontend/src/components/TypeEdit.tsx
@@ -14,7 +14,8 @@ function TypeEdit(_props: any) {
     Logs: _props.typeItem.Logs,
     State: _props.typeItem.State,
     CPU: _props.typeItem.CPU,
-    Mem: _props.typeItem.Mem
+    Mem: _props.typeItem.Mem,
+    SSH: _props.typeItem.SSH
   };
 
   const [isModalOpen, setModalOpen] = useState<boolean>(false);
@@ -70,6 +71,8 @@ function TypeEdit(_props: any) {
           <form>
             <label htmlFor="nid" className="form-label text-primary">Name</label>
             <input className="form-control mb-3" defaultValue={oldType.Name} id="nid" name="Name" onChange={handleChange} placeholder="Not empty string"></input>
+            <label htmlFor="sshid" className="form-label text-primary">SSH (optional)</label>
+            <input className="form-control mb-3" defaultValue={oldType.SSH} id="sshid" name="SSH" onChange={handleChange} placeholder=""></input>
             <p>Use variable <code>$ITEMNAME</code> in the commands below</p>
             <label htmlFor="gid" className="form-label text-primary">Start</label>
             <input className="form-control mb-3" defaultValue={oldType.Start} id="gid" name="Start" onChange={handleChange} placeholder="docker start $ITEMNAME"></input>

diff --git a/frontend/src/functions/exports.tsx b/frontend/src/functions/exports.tsx
@@ -28,4 +28,5 @@ export interface TypeStruct {
     State: string;
     CPU: string;
     Mem: string;
+    SSH: string;
 };