From e1e95d2a9cd64eb2fc730350a25cc0410a17a9c2 Mon Sep 17 00:00:00 2001 From: xiao Date: Sat, 21 Dec 2024 18:31:40 +0800 Subject: [PATCH] feat --- Dockerfile | 5 ++--- arm64/Dockerfile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c70ccef..ea1bd86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,10 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \ # 复制脚本 COPY ["bt.sh", "init_mysql.sh", "/"] -COPY ["phpmyadmin.sh", "/lnmp/"] +COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"] # 转换启动脚本 -RUN dos2unix /bt.sh && dos2unix /init_mysql.sh +RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh # 下载并安装宝塔面板及 lnmp 环境 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ @@ -29,7 +29,6 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && sh /lnmp/nginx.sh install 1.27 \ && curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \ && sh /lnmp/php.sh install 8.3 \ - && curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \ && sh /lnmp/mysql.sh install 8.0 \ && sh /lnmp/phpmyadmin.sh install 5.2 \ && rm -rf /lnmp \ diff --git a/arm64/Dockerfile b/arm64/Dockerfile index 18d8566..3cf61ea 100644 --- a/arm64/Dockerfile +++ b/arm64/Dockerfile @@ -17,10 +17,10 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \ # 复制脚本 COPY ["bt.sh", "init_mysql.sh", "/"] -COPY ["phpmyadmin.sh", "/lnmp/"] +COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"] # 转换启动脚本 -RUN dos2unix /bt.sh && dos2unix /init_mysql.sh +RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh # 下载并安装宝塔面板及 lnmp 环境 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ @@ -29,7 +29,6 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && sh /lnmp/nginx.sh install openresty \ && curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \ && sh /lnmp/php.sh install 8.3 \ - && curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \ && sh /lnmp/mysql.sh install 8.0 \ && sh /lnmp/phpmyadmin.sh install 5.2 \ && rm -rf /lnmp \