From 9d4cfb078d1669fb10b23c8acc2ca2d19ab70b67 Mon Sep 17 00:00:00 2001
From: lsy <lsy22@vip.qq.com>
Date: Sat, 14 Dec 2024 16:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9ATypecho=20Dockerfile=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84PHP=E7=89=88=E6=9C=AC=EF=BC=8C=E6=94=B9=E8=BF=9BNginx?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=97=B6=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Config/Docker/Installs/typecho.sh | 2 +-
 Config/Web/nginx/install.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Config/Docker/Installs/typecho.sh b/Config/Docker/Installs/typecho.sh
index 4220d2e..a67e2fc 100644
--- a/Config/Docker/Installs/typecho.sh
+++ b/Config/Docker/Installs/typecho.sh
@@ -15,7 +15,7 @@ mkdir php
 mkdir -p nginx/conf
 
 cat > "./php/Dockerfile" << 'EOF'
-FROM php:fpm
+FROM php:8.2-fpm
 
 # 更新包列表并安装 pdo_mysql 扩展
 RUN apt-get update && \
diff --git a/Config/Web/nginx/install.sh b/Config/Web/nginx/install.sh
index fd78c19..cc7373e 100644
--- a/Config/Web/nginx/install.sh
+++ b/Config/Web/nginx/install.sh
@@ -29,7 +29,7 @@ else
     read -p "请选择：" user_choice
     bash "$(dirname $(dirname $0))/acme/test.sh"
     bash "$(dirname $(dirname $0))/acme/apply.sh" "nginx" "${domain_names}"
-    folder_domain=$(ls ${HOME}/.acme.sh/ | grep "${primary_domain}")
+    folder_domain=$(ls ${HOME}/.acme.sh/ | grep "^${primary_domain}" | head -n1)
     ssl_cert_path="${HOME}/.acme.sh/${folder_domain}/fullchain.cer"
     ssl_key_path="${HOME}/.acme.sh/${folder_domain}/${primary_domain}.key"
 fi