Merge branch 'dev' into HEAD

src/pages/api/docker/DockerSingleton.ts

@@ -9,7 +9,12 @@ export default class DockerSingleton extends Docker {
 
   public static getInstance(): DockerSingleton {
     if (!DockerSingleton.dockerInstance) {
-      DockerSingleton.dockerInstance = new DockerSingleton();
+      DockerSingleton.dockerInstance = new Docker({
+        // If env variable DOCKER_HOST is not set, it will use the default socket
+        ...(process.env.DOCKER_HOST && { host: process.env.DOCKER_HOST }),
+        // Same thing for docker port
+        ...(process.env.DOCKER_PORT && { port: process.env.DOCKER_PORT }),
+      });
     }
     return DockerSingleton.dockerInstance;
   }