From 1e138ab31d6d2979ff36a1cd0038d4f766409cad Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Thu, 23 Nov 2023 18:35:09 +0800
Subject: [PATCH] fix bug

---
 nginx/Dockerfile          | 9 ++-------
 nginx/sh/install_nginx.sh | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 57bd2cf..9bdc73b 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,18 +1,13 @@
 #基于哪个镜像制作,3.14会有问题
 FROM alpine:3.13
-RUN addgroup -S nginx && adduser -S nginx -G nginx
-USER nginx
+
 #工作目录
 WORKDIR /opt
 # 确保 nginx 用户有权限访问复制的文件
-COPY --chown=nginx:nginx sh/* /opt/
+COPY sh/* /opt/
 #执行安装脚本
-# 切换到 root 用户进行安装
-USER root
 RUN sh install_nginx.sh
 
-# 切换回 nginx 用户
-USER nginx
 
 #健康检查
 HEALTHCHECK --interval=10s --timeout=5s \
diff --git a/nginx/sh/install_nginx.sh b/nginx/sh/install_nginx.sh
index dd3f75a..be813ca 100644
--- a/nginx/sh/install_nginx.sh
+++ b/nginx/sh/install_nginx.sh
@@ -52,6 +52,8 @@ install_before(){
 
 #安装nginx
 install_nginx(){
+	# 创建用户
+	addgroup -S nginx && adduser -S nginx -G nginx
 	cd /usr/local
 	NGINX_NAME=xcdn-binary-alpine-${nginx_version}-${THEDATE}_x86_64.tar.gz
 	wget http://soft.xiaoz.org/xcdn/${NGINX_NAME}
@@ -63,6 +65,7 @@ install_nginx(){
 	export PATH=$PATH:'/usr/local/nginx/sbin'
 	# 设置权限
 	chown -R nginx:nginx /usr/local/nginx
+	chown -R nginx:nginx /opt
 
 	#日志分割
 	#wget --no-check-certificate https://raw.githubusercontent.com/helloxz/nginx-cdn/master/etc/logrotate.d/nginx -P /etc/logrotate.d/