From 231dbc4577b795c2b6c8cafaee35d5c5d9fbe26a Mon Sep 17 00:00:00 2001
From: Pablo Ruiz <pruizlezcano@gmail.com>
Date: Wed, 6 Oct 2021 22:17:43 +0200
Subject: [PATCH] Added remote docker host

---
 .../Settings/OtherSettings/OtherSettings.tsx  | 13 ++++++++++++
 client/src/interfaces/Forms.ts                |  1 +
 controllers/apps.js                           | 21 ++++++++++++-------
 utils/initialConfig.json                      |  4 ++++
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Settings/OtherSettings/OtherSettings.tsx b/client/src/components/Settings/OtherSettings/OtherSettings.tsx
index afaf072..bd9bf49 100644
--- a/client/src/components/Settings/OtherSettings/OtherSettings.tsx
+++ b/client/src/components/Settings/OtherSettings/OtherSettings.tsx
@@ -52,6 +52,7 @@ const OtherSettings = (props: ComponentProps): JSX.Element => {
     bookmarksSameTab: 0,
     searchSameTab: 0,
     dockerApps: 1,
+    dockerHost: 'localhost',
     kubernetesApps: 1,
     unpinStoppedApps: 1,
   });
@@ -72,6 +73,7 @@ const OtherSettings = (props: ComponentProps): JSX.Element => {
       bookmarksSameTab: searchConfig('bookmarksSameTab', 0),
       searchSameTab: searchConfig('searchSameTab', 0),
       dockerApps: searchConfig('dockerApps', 0),
+      dockerHost: searchConfig('dockerHost', 'localhost'),
       kubernetesApps: searchConfig('kubernetesApps', 0),
       unpinStoppedApps: searchConfig('unpinStoppedApps', 0),
     });
@@ -275,6 +277,17 @@ const OtherSettings = (props: ComponentProps): JSX.Element => {
 
       {/* DOCKER SETTINGS */}
       <h2 className={classes.SettingsSection}>Docker</h2>
+      <InputGroup>
+        <label htmlFor="dockerHost">Docker Host</label>
+        <input
+          type="text"
+          id="dockerHost"
+          name="dockerHost"
+          placeholder="dockerHost:port"
+          value={formData.dockerHost}
+          onChange={(e) => inputChangeHandler(e)}
+        />
+      </InputGroup>
       <InputGroup>
         <label htmlFor="dockerApps">Use Docker API</label>
         <select
diff --git a/client/src/interfaces/Forms.ts b/client/src/interfaces/Forms.ts
index 177821d..bd53e2d 100644
--- a/client/src/interfaces/Forms.ts
+++ b/client/src/interfaces/Forms.ts
@@ -19,6 +19,7 @@ export interface SettingsForm {
   bookmarksSameTab: number;
   searchSameTab: number;
   dockerApps: number;
+  dockerHost: string;
   kubernetesApps: number;
   unpinStoppedApps: number;
 }
diff --git a/controllers/apps.js b/controllers/apps.js
index 02cfaec..dfb5e0c 100644
--- a/controllers/apps.js
+++ b/controllers/apps.js
@@ -65,16 +65,23 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
   if (useDockerApi && useDockerApi.value == 1) {
     let containers = null;
 
+    const host = await Config.findOne({
+      where: { key: 'dockerHost' }
+    });
+
     try {
-      let { data } = await axios.get(
-        'http://localhost/containers/json?{"status":["running"]}',
+      if(host.value.includes('localhost')) {
+        let { data } = await axios.get(`http://${host.value}/containers/json?{"status":["running"]}`,
         {
-          socketPath: '/var/run/docker.sock',
-        }
-      );
-      containers = data;
+          socketPath: '/var/run/docker.sock'
+        });
+        containers = data;
+      } else {
+        let { data } = await axios.get(`http://${host.value}/containers/json?{"status":["running"]}`);
+        containers = data;
+      }
     } catch {
-      logger.log("Can't connect to the docker socket", 'ERROR');
+      logger.log(`Can't connect to the docker api on ${host.value}`, 'ERROR');
     }
 
     if (containers) {
diff --git a/utils/initialConfig.json b/utils/initialConfig.json
index f35bd7c..18cc3b4 100644
--- a/utils/initialConfig.json
+++ b/utils/initialConfig.json
@@ -68,6 +68,10 @@
       "key": "dockerApps",
       "value": false
     },
+    {
+      "key": "dockerHost",
+      "value": "localhost"
+    },
     {
       "key": "kubernetesApps",
       "value": false