From 49f9fa0f1bfd68d5ac89ac67e0a38cff5b4ffb13 Mon Sep 17 00:00:00 2001
From: ajnart <ajnart@pm.me>
Date: Wed, 26 Jul 2023 13:03:08 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=B3=20Add=20docker=20shortcuts=20i?=
 =?UTF-8?q?nside=20`package.json`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 49f0b7b82..8f71d3a97 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,9 @@
     "test": "vitest",
     "test:ui": "vitest --ui",
     "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "docker:build": "docker build . -t homarr:dev",
+    "docker:start": "docker run --env-file ./.env -p 7575:7575 homarr:dev "
   },
   "dependencies": {
     "@ctrl/deluge": "^4.1.0",
@@ -155,7 +157,9 @@
       "^[./]"
     ],
     "importOrderSeparation": true,
-    "plugins": ["@trivago/prettier-plugin-sort-imports"],
+    "plugins": [
+      "@trivago/prettier-plugin-sort-imports"
+    ],
     "importOrderSortSpecifiers": true
   },
   "eslintConfig": {
@@ -217,4 +221,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file

From 52f5e9af96f57b5f28e497e8c689376897bb55cb Mon Sep 17 00:00:00 2001
From: ajnart <ajnart@pm.me>
Date: Wed, 26 Jul 2023 13:16:37 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=B3=20Edit=20docker=20shortcuts=20?=
 =?UTF-8?q?inside=20`package.json`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8f71d3a97..182c5840b 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "test:ui": "vitest --ui",
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "docker:build": "docker build . -t homarr:dev",
+    "docker:build": "turbo build && docker build . -t homarr:dev",
     "docker:start": "docker run --env-file ./.env -p 7575:7575 homarr:dev "
   },
   "dependencies": {

From d4aa3e4e07caabefb455a9a6da25e1660cfdd695 Mon Sep 17 00:00:00 2001
From: ajnart <ajnart@pm.me>
Date: Wed, 26 Jul 2023 13:17:00 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20edit=20mode=20password?=
 =?UTF-8?q?=20working=20with=20lowercase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/api/configs/tryPassword.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/api/configs/tryPassword.tsx b/src/pages/api/configs/tryPassword.tsx
index 1632985ab..6e6b98670 100644
--- a/src/pages/api/configs/tryPassword.tsx
+++ b/src/pages/api/configs/tryPassword.tsx
@@ -5,8 +5,12 @@ function Post(req: NextApiRequest, res: NextApiResponse) {
   const { tried, type = 'password' } = req.body;
   // If the type of password is "edit", we run this branch to check the edit password
   if (type === 'edit') {
-    if (tried === process.env.EDIT_MODE_PASSWORD) {
-      process.env.DISABLE_EDIT_MODE = process.env.DISABLE_EDIT_MODE === 'true' ? 'false' : 'true';
+    if ((tried === process.env.EDIT_MODE_PASSWORD) !== undefined) {
+      if (process.env.DISABLE_EDIT_MODE?.toLowerCase() === 'true') {
+        process.env.DISABLE_EDIT_MODE = 'false';
+      } else {
+        process.env.DISABLE_EDIT_MODE = 'true';
+      }
       return res.status(200).json({
         success: true,
       });

From d9c0d8d021812fd92b38315cccf285c5e68eba34 Mon Sep 17 00:00:00 2001
From: ajnart <ajnart@pm.me>
Date: Tue, 1 Aug 2023 18:38:13 +0900
Subject: [PATCH 4/4] Fix values for ``DOCKER_HOST``

---
 src/server/api/routers/docker/DockerSingleton.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/server/api/routers/docker/DockerSingleton.ts b/src/server/api/routers/docker/DockerSingleton.ts
index 9694059be..7ddc9cc6e 100644
--- a/src/server/api/routers/docker/DockerSingleton.ts
+++ b/src/server/api/routers/docker/DockerSingleton.ts
@@ -9,12 +9,7 @@ export default class DockerSingleton extends Docker {
 
   public static getInstance(): DockerSingleton {
     if (!DockerSingleton.dockerInstance) {
-      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 }),
-      });
+      DockerSingleton.dockerInstance = new Docker();
     }
     return DockerSingleton.dockerInstance;
   }