From 104e66d4d06fde4a7b1884aade5d7525660dc1a6 Mon Sep 17 00:00:00 2001
From: ngc2207 <cfngc3109@gmail.com>
Date: Fri, 10 Jan 2025 18:35:18 +0800
Subject: [PATCH] fix: update Docker configuration for clangd services and
 adjust port mappings

---
 docker/compose.yml           | 10 +++++-----
 docker/lsp/clangd/Dockerfile | 23 +++++++++--------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/docker/compose.yml b/docker/compose.yml
index fa26513..081cd7e 100644
--- a/docker/compose.yml
+++ b/docker/compose.yml
@@ -40,7 +40,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     ports:
       - "3000:3000"
-      - "22:22"
+      - "2222:22"
     depends_on:
       postgres:
         condition: service_healthy
@@ -48,8 +48,8 @@ services:
   lsp-c:
     image: clangd:latest
     build:
-      context: ./lsp/clangd
-      dockerfile: Dockerfile
+      context: ./lsp
+      dockerfile: clangd/Dockerfile
     container_name: lsp-c
     restart: always
     ports:
@@ -58,8 +58,8 @@ services:
   lsp-cpp:
     image: clangd:latest
     build:
-      context: ./lsp/clangd
-      dockerfile: Dockerfile
+      context: ./lsp
+      dockerfile: clangd/Dockerfile
     container_name: lsp-cpp
     restart: always
     ports:
diff --git a/docker/lsp/clangd/Dockerfile b/docker/lsp/clangd/Dockerfile
index 4a24fc3..4b570e0 100644
--- a/docker/lsp/clangd/Dockerfile
+++ b/docker/lsp/clangd/Dockerfile
@@ -1,24 +1,19 @@
-FROM alpine:latest as builder
+FROM alpine:3.21
 
-RUN apk add --no-cache git npm
+RUN echo "https://mirror.nju.edu.cn/alpine/v3.21/main" > /etc/apk/repositories && \
+    echo "https://mirror.nju.edu.cn/alpine/v3.21/community" >> /etc/apk/repositories
+
+RUN apk add --no-cache git npm build-base clang-extra-tools nodejs
+
+RUN npm config set registry https://registry.npmmirror.com
 
 WORKDIR /app
 
-RUN git clone https://github.com/wylieconlon/jsonrpc-ws-proxy.git
+COPY jsonrpc-ws-proxy ./jsonrpc-ws-proxy
 
 WORKDIR /app/jsonrpc-ws-proxy
 
-COPY servers.yml .
-
-RUN npm install && npm run prepare
-
-FROM alpine:latest
-
-RUN apk add --no-cache build-base clang-extra-tools nodejs
-
-WORKDIR /app/jsonrpc-ws-proxy
-
-COPY --from=builder /app/jsonrpc-ws-proxy .
+COPY clangd/servers.yml .
 
 EXPOSE 3000