Merge 7d873e0240 into 446b4095f6

client/src/components/Settings/DockerSettings/DockerSettings.tsx

@@ -57,7 +57,7 @@ export const DockerSettings = (): JSX.Element => {
   return (
     <form onSubmit={(e) => formSubmitHandler(e)}>
       <SettingsHeadline text="Docker" />
-      {/* CUSTOM DOCKER SOCKET HOST */}
+      {/* CUSTOM DOCKER REMOTE HOST */}
       <InputGroup>
         <label htmlFor="dockerHost">Docker host</label>
         <input
@@ -100,6 +100,19 @@ export const DockerSettings = (): JSX.Element => {
         </select>
       </InputGroup>
 
+      {/* CUSTOM DOCKER SOCKET */}
+      <InputGroup>
+        <label htmlFor="dockerSocket">Docker socket</label>
+        <input
+          type="text"
+          id="dockerSocket"
+          name="dockerSocket"
+          placeholder="/path/to/socket.sock"
+          value={formData.dockerSocket}
+          onChange={(e) => inputChangeHandler(e)}
+        />
+      </InputGroup>
+
       {/* KUBERNETES SETTINGS */}
       <SettingsHeadline text="Kubernetes" />
       {/* USE KUBERNETES */}

client/src/interfaces/Config.ts

@@ -20,6 +20,7 @@ export interface Config {
   secondarySearchProvider: string;
   dockerApps: boolean;
   dockerHost: string;
+  dockerSocket: string;
   kubernetesApps: boolean;
   unpinStoppedApps: boolean;
   useAmericanDate: boolean;

client/src/interfaces/Forms.ts

@@ -37,6 +37,7 @@ export interface UISettingsForm {
 export interface DockerSettingsForm {
   dockerApps: boolean;
   dockerHost: string;
+  dockerSocket: string;
   kubernetesApps: boolean;
   unpinStoppedApps: boolean;
 }

client/src/utility/templateObjects/configTemplate.ts

@@ -20,6 +20,7 @@ export const configTemplate: Config = {
   secondarySearchProvider: 'd',
   dockerApps: false,
   dockerHost: 'localhost',
+  dockerSocket: '/var/run/docker.sock',
   kubernetesApps: false,
   unpinStoppedApps: false,
   useAmericanDate: false,

client/src/utility/templateObjects/settingsTemplate.ts

@@ -44,6 +44,7 @@ export const generalSettingsTemplate: GeneralForm = {
 export const dockerSettingsTemplate: DockerSettingsForm = {
   dockerApps: true,
   dockerHost: 'localhost',
+  dockerSocket: '/var/run/docker.sock',
   kubernetesApps: true,
   unpinStoppedApps: true,
 };

controllers/apps/docker/useDocker.js

@@ -9,6 +9,7 @@ const useDocker = async (apps) => {
     useOrdering: orderType,
     unpinStoppedApps,
     dockerHost: host,
+    dockerSocket: socket
   } = await loadConfig();
 
   let containers = null;
@@ -20,7 +21,7 @@ const useDocker = async (apps) => {
       let { data } = await axios.get(
         `http://${host}/containers/json?{"status":["running"]}`,
         {
-          socketPath: '/var/run/docker.sock',
+          socketPath: socket,
         }
       );
 

utils/init/initialConfig.json

@@ -18,6 +18,7 @@
   "secondarySearchProvider": "d",
   "dockerApps": false,
   "dockerHost": "localhost",
+  "dockerSocket": "/var/run/docker.sock",
   "kubernetesApps": false,
   "unpinStoppedApps": false,
   "useAmericanDate": false,