From 616be7bfe0245d9f9eeba61d2e2282e9dabb5229 Mon Sep 17 00:00:00 2001
From: xintaofei <xintaofei@users.noreply.github.com>
Date: Tue, 31 Mar 2026 13:25:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9C=AA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81docker=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=BF=85=E8=A6=81=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile    | 8 +++++++-
 Dockerfile.ci | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36856fc..8c010ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,18 @@ COPY src-tauri/ ./
 RUN cargo build --release --bin codeg-server --no-default-features
 
 # Stage 3: Runtime
-FROM debian:bookworm-slim
+FROM node:22-bookworm-slim
 RUN apt-get update && apt-get install -y \
     libsqlite3-0 \
     git \
     openssh-client \
     ca-certificates \
+    curl \
+    python3 \
+    python3-pip \
+    gcc \
+    g++ \
+    make \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=backend /app/src-tauri/target/release/codeg-server /usr/local/bin/codeg-server
diff --git a/Dockerfile.ci b/Dockerfile.ci
index bf3598f..9ab6364 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,6 +1,6 @@
 # CI-only Dockerfile: uses pre-built binaries from build-server job
 # For local builds, use the standard Dockerfile instead
-FROM debian:bookworm-slim
+FROM node:22-bookworm-slim
 
 ARG TARGETARCH
 
@@ -9,6 +9,12 @@ RUN apt-get update && apt-get install -y \
     git \
     openssh-client \
     ca-certificates \
+    curl \
+    python3 \
+    python3-pip \
+    gcc \
+    g++ \
+    make \
     && rm -rf /var/lib/apt/lists/*
 
 COPY dist/${TARGETARCH}/codeg-server /usr/local/bin/codeg-server

From 99b8ecabfc3bfeb37fb36603d6729b8ff74693ff Mon Sep 17 00:00:00 2001
From: xintaofei <xintaofei@users.noreply.github.com>
Date: Tue, 31 Mar 2026 13:44:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/capabilities/desktop.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json
index d42ecf2..0abee9c 100644
--- a/src-tauri/capabilities/desktop.json
+++ b/src-tauri/capabilities/desktop.json
@@ -9,6 +9,9 @@
     "welcome",
     "folder-*",
     "commit-*",
+    "merge-*",
+    "stash-*",
+    "push-*",
     "settings",
     "project-boot"
   ],