From 0d363e8aa29b60e807d63577b676bb521b87e7fd Mon Sep 17 00:00:00 2001
From: sijinhui <sijinhui@qq.com>
Date: Sun, 18 Aug 2024 20:44:47 +0800
Subject: [PATCH] merge

---
 .github/workflows/dockerToHub.yml | 8 ++++----
 Dockerfile                        | 2 +-
 app/components/markdown.tsx       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml
index 7d689b86d..1e3d40d41 100644
--- a/.github/workflows/dockerToHub.yml
+++ b/.github/workflows/dockerToHub.yml
@@ -1,9 +1,9 @@
-name: PRO DEPLOY
+name: BUILD DOCKER IMAGE
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
+#  push:
+#    branches:
+#      - main
 #    paths:
 #      - 'app/**'
 #      - 'public/**'
diff --git a/Dockerfile b/Dockerfile
index a3408e8ad..187226af7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sijinhui/chatgpt-next-web:buildcache as deps
+FROM sijinhui/chatgpt-next-web:buildcache AS deps
 
 WORKDIR /app
 
diff --git a/app/components/markdown.tsx b/app/components/markdown.tsx
index 5515164c4..03da5b47f 100644
--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -250,8 +250,8 @@ function _MarkDownContent(props: { content: string }) {
         ],
       ]}
       components={{
-        pre: PreCode,
-        code: CustomCode,
+        pre: PreCode as any,
+        code: CustomCode as any,
         p: (pProps) => <p {...pProps} dir="auto" />,
         a: (aProps) => {
           const href = aProps.href || "";