Merge pull request ChatGPTNextWeb#1738 from gtoxlili/main

fix : specify the default hostname if docker builds with a proxy
square0083 · May 24, 2023 · bb3f6ee · bb3f6ee
2 parents 89f0a48 + aa2be9b
commit bb3f6ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -41,6 +41,9 @@ COPY --from=builder /app/.next/server ./.next/server
 EXPOSE 3000
 
 CMD if [ -n "$PROXY_URL" ]; then \
+        if [ -z "$HOSTNAME" ]; then \
+          export HOSTNAME="127.0.0.1" \
+        fi; \
         protocol=$(echo $PROXY_URL | cut -d: -f1); \
         host=$(echo $PROXY_URL | cut -d/ -f3 | cut -d: -f1); \
         port=$(echo $PROXY_URL | cut -d: -f3); \

diff --git a/app/utils/format.ts b/app/utils/format.ts
@@ -1,7 +1,10 @@
 export function prettyObject(msg: any) {
+  const obj = msg;
   if (typeof msg !== "string") {
     msg = JSON.stringify(msg, null, "  ");
   }
-  const prettyMsg = ["```json", msg, "```"].join("\n");
-  return prettyMsg;
+  if (msg === "{}") {
+    return obj.toString();
+  }
+  return ["```json", msg, "```"].join("\n");
 }