Merge branch 'dev' of https://git.tonyandmoney.cn/tuonian/nginx-ui into dev

README.md

@@ -16,4 +16,11 @@ wails dev
 wails build -webview2=embed
 ## 带debug
 wails build -webview2=embed -debug
-```
+```
+
+
+## 变更说明
+
+### 2023-12-19
+- 对接第三方oauth
+- docker镜像增加ca-certificates curl 软件安装

docker/Dockerfile

@@ -24,9 +24,8 @@ RUN chmod +x /app/app
 
 RUN rm -rf /app/static/web/config.js
 
-RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-RUN sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-#RUN echo "deb http://mirrors.ustc.edu.cn/debian sid main" >> /etc/apt/sources.list
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/*
+RUN sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/*
 RUN apt -qq update && apt -qq install -y --no-install-recommends ca-certificates curl
 
 ENTRYPOINT ["/app/app"]

docker/Dockerfile-with-nginx

@@ -23,8 +23,8 @@ RUN chmod +x /entrypoint.sh /app/app
 
 RUN rm -rf /app/static/web/config.js
 RUN rm -rf /etc/nginx/conf.d
-#RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
-#RUN sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/*
+RUN sed -i 's/security.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/*
 #RUN echo "deb http://mirrors.ustc.edu.cn/debian sid main" >> /etc/apt/sources.list
 
 ENTRYPOINT ["/entrypoint.sh"]