Update Dockerfile

Dockerfile

@@ -1,23 +1,24 @@
 FROM ubuntu:22.04
 
+# 系统变量
+ENV GH_TOKEN = ${GH_TOKEN}
+ENV LANG C.UTF-8
+ENV LANGUAGE C.UTF-8
+ENV TZ=Asia/Shanghai
+
 # 安装基础依赖和code-server
-RUN apt-get update && apt-get install -y \
-    curl \
-    sudo \
-    && curl -fsSL https://code-server.dev/install.sh | sh
-RUN apt install gcc g++ gdb clangd wget git -y
-RUN cd /usr/local/bin
-RUN wget -O /usr/local/bin/frpc https://nya.globalslb.net/natfrp/client/frpc/0.51.0-sakura-12.3/frpc_linux_amd64
-RUN chmod 755 /usr/local/bin/frpc
-RUN ls -l /usr/local/bin/frpc
-RUN md5sum /usr/local/bin/frpc
-# 创建一个非root用户（可选，但更安全）
-RUN useradd -m -s /bin/bash coder && \
-    echo "coder:coder" | chpasswd && \
-    usermod -aG sudo coder
+RUN apt-get update && apt-get install -y && \
+    apt install gcc g++ gdb clangd wget git -y && \
+    url -fsSL https://code-server.dev/install.sh | sh 
 
-COPY config.yaml /home/coder/.config/code-server/
+# 安装frpc
+RUN cd /usr/local/bin && \
+    wget -O /usr/local/bin/frpc https://nya.globalslb.net/natfrp/client/frpc/0.51.0-sakura-12.3/frpc_linux_amd64 && \
+    chmod 755 /usr/local/bin/frpc && \
+    ls -l /usr/local/bin/frpc && \
+    md5sum /usr/local/bin/frpc
 
+# 配置frpc与codeserver同时运行
 RUN echo '#!/bin/bash\n\
 # 1. 启动 frpc (后台运行)\n\
 /usr/local/bin/frpc -f xi0ysolte634lz5zl7g2l80p5gvktkj5:24754182 &\n\
@@ -25,31 +26,44 @@ RUN echo '#!/bin/bash\n\
 exec code-server /home/coder/cpp_competition' > /start.sh
 RUN chmod +x /start.sh
 
+
+# 创建一个非root用户（可选，但更安全）
+RUN useradd -m -s /bin/bash coder && \
+    echo "coder:coder" | chpasswd && \
+    usermod -aG sudo coder
+
 # 设置工作目录和用户
 WORKDIR /home/coder
+
 # 切换回coder用户
 USER coder
 
+# 配置codeserver的语言和扩展
+COPY settings.json /home/coder/.local/share/code-server/User/
+COPY config.yaml /home/coder/.config/code-server/
+COPY create_languagepacks.sh /home/
 COPY cph-ng-0.5.5.vsix /home/
 COPY vscode-luogu.vsix /home/
-RUN code-server --install-extension /home/cph-ng-0.5.5.vsix
-RUN code-server --install-extension /home/vscode-luogu.vsix
-RUN code-server --install-extension hediet.vscode-drawio
-RUN code-server --install-extension formulahendry.code-runner
-RUN code-server --install-extension llvm-vs-code-extensions.vscode-clangd
-
-RUN git config --global user.name "Save-it"
-RUN git config --global user.email "lin2011746853@outlook.com"
-RUN git clone https://github.com/Save-it/cpp_competition.git /home/coder/cpp_competition
-RUN echo '*.exe' > /home/coder/cpp_competition/.gitignore
-
-# 设置环境变量
-ENV TZ=Asia/Shanghai
+RUN code-server --install-extension /home/cph-ng-0.5.5.vsix && \
+    code-server --install-extension /home/vscode-luogu.vsix && \
+    code-server --install-extension ms-ceintl.vscode-language-pack-zh-hans && \
+    code-server --install-extension hediet.vscode-drawio && \
+    code-server --install-extension formulahendry.code-runner && \
+    code-server --install-extension llvm-vs-code-extensions.vscode-clangd && \
+    /home/create_languagepacks.sh
+    
+#配置git
+RUN git config --global user.name "Save-it" && \
+    git config --global user.email "lin2011746853@outlook.com" && \
+    git config --global credential.helper store && \
+    git config --global credential.https://Save-it@github.com.username Save-it && \
+    git config --global credential.https://Save-it@github.com.password ${GH_TOKEN} && \
+    git clone https://github.com/Save-it/cpp_competition.git /home/coder/cpp_competition && \
+    echo '*.exe \n *.out' > /home/coder/cpp_competition/.gitignore
 
-# 暴露code-server默认端口
+# 暴露端口
 EXPOSE 8080
 EXPOSE 7860
-EXPOSE 27121
 
 # 将启动脚本设为容器入口
 CMD ["/start.sh"]