Compare commits

...

49 Commits

Author SHA1 Message Date
xiao
df1c0a1a75 refactor: 更新 MySQL 安装脚本以使用最新版本 2024-12-22 09:33:59 +08:00
xiao
ee3ff7a659 Update Dockerfile: Switch to PHP 8.3 and MySQL 8.0 versions for compatibility improvements 2024-12-21 19:42:18 +08:00
xiao
6486a010bb Update build configuration and Dockerfile for improved build process and script management 2024-12-21 19:38:58 +08:00
xiao
e9b4d2c505 Update Dockerfile: Modify script copying and dos2unix commands for phpMyAdmin and MySQL 2024-12-21 18:35:37 +08:00
xiao
675f549e00 feat: 增强脚本可控性 2024-12-21 18:08:45 +08:00
xiao
beb0d11eca chore: 更新宝塔面板及lamp环境安装脚本
修改了宝塔面板及lamp环境安装脚本的版本号,以确保安装的是最新版本。
2024-12-21 17:40:49 +08:00
xiao
35a4d9fdfc refactor: 优化 Dockerfile 中的端口暴露和健康检查设置 2024-12-21 09:25:28 +08:00
xiao
88535b06f8 feat: 更新 Docker 镜像构建和推送流程 2024-11-26 11:06:56 +08:00
xiao
81cfe42568 chore: 更新构建配置以支持新的构建类型
将原有的 `bullseye` 构建配置重命名为 `lamp_bullseye`,以便更好地反映新的构建类型。
2024-11-25 12:49:11 +08:00
xiao
23ae28fa4d feat: 更新构建流程 2024-11-25 12:42:15 +08:00
xiao
9d4a6b0d94 chore: 更新 Apache 安装脚本以使用最新版本 2024-11-17 10:34:51 +08:00
xiao
ccdba79f39 chore: 更新 Dockerfile 中的清理命令以移除多余的目录 2024-11-16 23:55:28 +08:00
xiao
21a6d9f8d4 feat: 更新 Docker 镜像构建和推送流程 2024-11-16 22:56:52 +08:00
xiao
c16e58d6af chore: 更新宝塔面板菜单配置 2024-11-15 14:48:17 +08:00
xiao
3e00262bb5 chore: 移除宝塔面板中不常用的菜单项
移除了宝塔面板中的 memuDocker、memuAftp 和 memuAfirewall 菜单项,以简化面板界面。
2024-11-15 14:24:24 +08:00
xiao
059280337d refactor: 优化 Dockerfile 中的命令执行顺序 2024-11-07 11:50:21 +08:00
xiao
6dbeed953b chore: 简化宝塔面板及lamp环境安装脚本 2024-11-07 09:59:06 +08:00
xiao
c1b1d8749b perf: 优化构建流程 2024-11-07 08:53:36 +08:00
xiao
e76337a279 feat: 完善启动脚本 2024-11-05 18:58:09 +08:00
xiao
d93c4bf0f7 fix: 编译环境错误 2024-11-05 18:02:41 +08:00
xiao
34b1e37bee fix: 编译环境错误 2024-11-05 17:52:14 +08:00
xiao
791c7fd497 fix: 流水线错误 2024-11-05 17:32:54 +08:00
xiao
14a19fd4cf fix: 流水线分支错误 2024-11-05 17:29:41 +08:00
xiao
0e7bb1d81b init: lamp 环境构建 2024-11-05 17:29:17 +08:00
xiao
64b63e0b3d fix: 修改为使用脚本初始化 2024-11-05 14:27:34 +08:00
xiao
0171c8f1a7 fix: 首次启动需要初始化MySQL的问题 2024-11-05 12:24:02 +08:00
xiao
d72609ad4d fix: 语法错误 2024-11-05 08:59:23 +08:00
xiao
2536fafd20 perf: 为 arm 编译分配更大内存 2024-11-05 08:55:26 +08:00
xiao
b916ca3611 test: 修改流水线超时时间 2024-11-05 08:09:01 +08:00
xiao
c4ba171095 fix: 区域设置失败 2024-11-04 23:51:27 +08:00
xiao
86df8d82dd test: 补充相关依赖 2024-11-04 23:10:32 +08:00
xiao
ff96ca34b8 test: 切换MySQL版本为8.0 2024-11-04 22:34:36 +08:00
xiao
76a57bc4f1 test: 尝试解决MySQL编译失败 2024-11-04 22:31:56 +08:00
xiao
14f2f6f312 test: 尝试解决MySQL编译失败的问题 2024-11-04 22:01:54 +08:00
xiao
2696b97d05 feat: 更换MySQL版本为5.7 2024-11-04 21:29:30 +08:00
xiao
a8981bd64e fix: 构建流水线错误 2024-11-04 20:48:03 +08:00
xiao
dcc4f077f0 feat: 调整标识文件 2024-11-04 20:20:41 +08:00
xiao
f2173baad4 fix: 脚本拷贝失败 2024-11-04 20:10:52 +08:00
xiao
4c04138e32 fix: 脚本文件拷贝失败 2024-11-04 20:07:08 +08:00
xiao
0b517521b1 test: 单独构建arm64 2024-11-04 20:05:07 +08:00
xiao
eb6e8f8dda test: Nginx 调整回1.27 2024-11-04 18:13:30 +08:00
xiao
e720b4e355 test: 尝试编译低版本 Nginx 2024-11-04 17:57:52 +08:00
xiao
373c0658c2 feat: 放弃构建phpmyadmin 2024-11-02 13:59:48 +08:00
xiao
d9cbf68384 test: 解决可能导致php安装失败的问题 2024-11-02 13:44:16 +08:00
xiao
b016977fe8 test: 尝试修复MySQL构建失败 2024-11-02 13:24:28 +08:00
xiao
cd6a6e9b48 test: 尝试修复安装nginx失败 2024-11-02 13:02:01 +08:00
xiao
451c68a393 feat: 启动时启动lnmp环境 2024-11-02 12:53:00 +08:00
xiao
0f17616182 feat: 预装环境 2024-11-02 12:50:25 +08:00
xiao
4e66543487 feat: 修改构建逻辑 2024-11-02 12:13:15 +08:00
5 changed files with 283 additions and 59 deletions

View File

@ -10,13 +10,15 @@ $:
tags: cnb:arch:amd64
services:
- docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env:
IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64
IMAGE_TAG: btpanel/baota:lamp_debian11-linux-amd64
stages:
- name: docker login
script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
- name: docker build
script: docker build -t ${IMAGE_TAG} .
timeout: 3600s
- name: docker push
script: docker push ${IMAGE_TAG}
- name: resolve
@ -26,14 +28,17 @@ $:
- runner:
tags: cnb:arch:arm64:v8
cpus: 16
services:
- docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env:
IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-arm64
IMAGE_TAG: btpanel/baota:lamp_debian11-linux-arm64
stages:
- name: docker login
script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
- name: docker build
timeout: 3600s
script: docker build -t ${IMAGE_TAG} .
- name: docker push
script: docker push ${IMAGE_TAG}
@ -41,11 +46,14 @@ $:
type: cnb:resolve
options:
key: build-arm64
- runner:
tags: cnb:arch:amd64
cpus: 2
- services:
- docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env:
IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest
IMAGE_TAG: btpanel/baota:lamp_debian11
stages:
- name: await the amd64
type: cnb:await
@ -58,8 +66,8 @@ $:
- name: manifest
image: cnbcool/manifest
settings:
username: $CNB_TOKEN_USER_NAME
password: $CNB_TOKEN
username: $DOCKER_USERNAME
password: $DOCKER_PASSWD
target: ${IMAGE_TAG}
template: ${IMAGE_TAG}-OS-ARCH
platforms:

View File

@ -1,13 +1,9 @@
FROM debian:bookworm
FROM debian:bullseye
# 切换 Debian 镜像源为腾讯云源
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources
# 更新包列表并升级系统中已经安装的软件包
RUN apt update && apt upgrade -y
# 安装前置依赖
RUN apt install -y \
# 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
&& apt update && apt upgrade -y \
&& apt install -y \
locales \
wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf \
libsodium-dev libonig-dev libssh2-1-dev libc-ares-dev libaio-dev sudo curl dos2unix \
@ -15,53 +11,53 @@ RUN apt install -y \
diffutils unzip tar libbz2-dev libncurses5 libncurses5-dev libtool libevent-dev libssl-dev libsasl2-dev \
libltdl-dev zlib1g-dev libglib2.0-0 libglib2.0-dev libkrb5-dev libpq-dev libpq5 gettext libcap-dev \
libc-client2007e-dev psmisc patch git e2fsprogs libxslt1-dev xz-utils libgd3 libwebp-dev libvpx-dev \
libfreetype6-dev libjpeg62-turbo libjpeg62-turbo-dev
libfreetype6-dev libjpeg62-turbo libjpeg62-turbo-dev iptables libudev-dev libldap2-dev \
&& apt clean \
&& rm -rf /var/lib/apt/lists/*
# 配置区域设置
RUN locale-gen en_US.UTF-8
# 复制脚本
COPY ["bt.sh", "init_mysql.sh", "/"]
COPY ["phpmyadmin.sh", "/lamp/"]
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
# 转换启动脚本
RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
# 复制 bt.sh 文件
COPY bt.sh /bt.sh
# 转换 bt.sh 文件的换行符
RUN dos2unix /bt.sh
# 设置构建参数
ARG RANDOM_NAME
# 设置一个btd12-前缀的随机主机名
RUN echo "btd12-${RANDOM_NAME}" > /etc/hostname
# 下载并安装宝塔面板
# 下载并安装宝塔面板及 lamp 环境
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
&& echo y | bash install_panel.sh -P 8888 --ssl-disable
# 配置宝塔面板安全入口和用户名及密码
RUN curl -o /lamp/apache.sh https://download.bt.cn/install/0/apache.sh \
&& sh /lamp/apache.sh install 2.4 \
&& curl -o /lamp/php.sh https://download.bt.cn/install/3/php.sh \
&& sh /lamp/php.sh install 8.3 \
&& curl -o /lamp/mysql.sh https://download.bt.cn/install/4/mysql.sh \
&& sh /lamp/mysql.sh install 8.0 \
&& sh /lamp/phpmyadmin.sh install 5.2 \
&& rm -rf /lamp \
&& rm -rf /www/server/php/83/src \
&& rm -rf /www/server/mysql/mysql-test \
&& rm -rf /www/server/mysql/src.tar.gz \
&& rm -rf /www/server/mysql/src \
&& rm -rf /www/server/data/* \
&& rm -rf /www/server/apache/src \
&& echo "docker_btlamp_d11" > /www/server/panel/data/o.pl \
&& echo '["memuA", "memuAsite", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* \
&& chmod +x /bt.sh \
&& chmod +x /init_mysql.sh
# 配置宝塔面板安全入口和用户名及密码,以及 SSH 密码
RUN echo btpanel | bt 6 \
&& echo btpaneldocker | bt 5 \
&& echo "/btpanel" > /www/server/panel/data/admin_path.pl
# 设置 root 用户密码
RUN echo "root:btpaneldocker" | chpasswd
# 赋予 bt.sh 可执行权限
RUN chmod +x /bt.sh
# 清理缓存
RUN apt clean \
&& rm -rf /var/lib/apt/lists/*
# 设置标识文件
RUN echo "dk_lib_test_d12" > /www/server/panel/data/o.pl
&& echo "/btpanel" > /www/server/panel/data/admin_path.pl \
&& echo "root:btpaneldocker" | chpasswd
ENTRYPOINT ["/bin/sh","-c","/bt.sh"]
# 暴漏所有端口
EXPOSE 0-65535
# 暴漏特定端口
EXPOSE 22 80 443 888 3306 8888
# 健康检查
HEALTHCHECK --interval=5s --timeout=3s CMD curl -i http://127.0.0.1:$(cat /www/server/panel/data/port.pl)$(cat /www/server/panel/data/admin_path.pl) | grep -E '(200|404)' || exit 1
HEALTHCHECK --interval=5s --timeout=3s CMD prot="http"; if [ -f "/www/server/panel/data/ssl.pl" ]; then prot="https"; fi; curl -k -i $prot://127.0.0.1:$(cat /www/server/panel/data/port.pl)$(cat /www/server/panel/data/admin_path.pl) | grep -E '(200|404)' || exit 1

81
bt.sh
View File

@ -1,5 +1,76 @@
/etc/init.d/bt restart
pkill crond
/sbin/crond
/usr/sbin/sshd -D &
tail -f /dev/null
#!/bin/bash
PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
export PATH
init_path=/etc/init.d
Root_Path=`cat /var/bt_setupPath.conf`
Setup_Path=$Root_Path/server/mysql
Data_Path=$Root_Path/server/data
O_pl=$(cat /www/server/panel/data/o.pl)
soft_start(){
# 扫描并启动所有服务
init_scripts=$(ls ${init_path})
for script in ${init_scripts}; do
case "${script}" in
"bt"|"mysqld"|"nginx"|"httpd")
continue
;;
esac
${init_path}/${script} start
done
if [ -f ${init_path}/nginx ]; then
${init_path}/nginx start
elif [ -f ${init_path}/httpd ]; then
${init_path}/httpd start
fi
${init_path}/bt stop
${init_path}/bt start
pkill crond
/sbin/crond
chmod 600 /etc/ssh/ssh_host_*
/usr/sbin/sshd -D &
}
init_mysql(){
if [ "${O_pl}" != "docker_btlamp_d11" ] && [ "${O_pl}" != "docker_btlnmp_d11" ];then
return
fi
if [ -d "${Data_Path}" ]; then
check_z=$(ls "${Data_Path}")
echo "check_z:"
echo ${check_z}
if [[ ! -z "${check_z}" ]]; then
echo "check_z is not empty"
return
fi
fi
if [ -f /init_mysql.sh ] && [ -d "${Setup_Path}" ];then
sh /init_mysql.sh
rm -f /init_mysql.sh
fi
}
is_empty_Data(){
return "$(ls -A ${Data_Path}/|wc -w)"
}
start_mysql(){
if [ -d "${Setup_Path}" ] && [ -f "${init_path}/mysqld" ];then
chown -R mysql:mysql ${Data_Path}
chgrp -R mysql ${Setup_Path}/.
${init_path}/mysqld start
fi
}
is_empty_Data > /dev/null
init_mysql > /dev/null
start_mysql > /dev/null
soft_start > /dev/null
#tail -f /dev/null
${init_path}/bt log

41
init_mysql.sh Normal file
View File

@ -0,0 +1,41 @@
#!/bin/bash
PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
export PATH
Root_Path=`cat /var/bt_setupPath.conf`
Setup_Path=$Root_Path/server/mysql
Data_Path=$Root_Path/server/data
Mysql_Initialize(){
if [ -d "${Data_Path}" ]; then
check_z=$(ls "${Data_Path}")
if [[ ! -z "${check_z}" ]]; then
return
fi
fi
mkdir -p ${Data_Path}
chown -R mysql:mysql ${Data_Path}
chgrp -R mysql ${Setup_Path}/.
${Setup_Path}/bin/mysqld --initialize-insecure --basedir=${Setup_Path} --datadir=${Data_Path} --user=mysql
cat > /etc/ld.so.conf.d/mysql.conf<<EOF
${Setup_Path}/lib
EOF
ldconfig
ln -sf ${Setup_Path}/lib/mysql /usr/lib/mysql
ln -sf ${Setup_Path}/include/mysql /usr/include/mysql
/etc/init.d/mysqld start
mysqlpwd=`cat /dev/urandom | head -n 16 | md5sum | head -c 16`
${Setup_Path}/bin/mysqladmin -u root password "${mysqlpwd}"
cd "${Setup_Path}"
rm -f src.tar.gz
rm -rf src
/etc/init.d/mysqld start
rm -rf /init_mysql.sh
}
Mysql_Initialize

108
phpmyadmin.sh Normal file
View File

@ -0,0 +1,108 @@
#!/bin/bash
PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
export PATH
public_file=/www/server/panel/install/public.sh
if [ ! -f $public_file ];then
wget -O $public_file https://download.bt.cn/install/public.sh -T 5;
fi
. $public_file
download_Url=$NODE_URL
Root_Path=`cat /var/bt_setupPath.conf`
Setup_Path=$Root_Path/server/phpmyadmin
webserver=""
Install_phpMyAdmin()
{
if [ -d "${Root_Path}/server/apache" ];then
webserver='apache'
elif [ -d "${Root_Path}/server/nginx" ];then
webserver='nginx'
elif [ -f "/usr/local/lsws/bin/lswsctrl" ];then
webserver='openlitespeed'
fi
if [ "${webserver}" == "" ];then
echo "No Web server installed!"
exit 0;
fi
PHPVersion=""
for phpVer in 52 53 54 55 56 70 71 72 73 74 80 81 82 83;
do
if [ -d "/www/server/php/${phpVer}/bin" ]; then
PHPVersion=${phpVer}
fi
done
if [ -z $PHPVersion ];then
echo "======================================"
echo "当前没有可用php停止安装"
echo "请先安装好php后再进行安装phpmyadmin"
exit 1;
fi
wget -O phpMyAdmin.zip $download_Url/src/phpMyAdmin-${1}.zip -T20
mkdir -p $Setup_Path
unzip -o phpMyAdmin.zip -d $Setup_Path/ > /dev/null
rm -f phpMyAdmin.zip
rm -rf $Root_Path/server/phpmyadmin/phpmyadmin*
phpmyadminExt=`cat /dev/urandom | head -n 32 | md5sum | head -c 16`;
mv $Setup_Path/databaseAdmin $Setup_Path/phpmyadmin_$phpmyadminExt
chmod -R 755 $Setup_Path/phpmyadmin_$phpmyadminExt
chown -R www.www $Setup_Path/phpmyadmin_$phpmyadminExt
chmod 755 /www/server/phpmyadmin
secret=`cat /dev/urandom | head -n 32 | md5sum | head -c 32`;
\cp -a -r $Setup_Path/phpmyadmin_$phpmyadminExt/config.sample.inc.php $Setup_Path/phpmyadmin_$phpmyadminExt/config.inc.php
sed -i "s#^\$cfg\['blowfish_secret'\].*#\$cfg\['blowfish_secret'\] = '${secret}';#" $Setup_Path/phpmyadmin_$phpmyadminExt/config.inc.php
sed -i "s#^\$cfg\['blowfish_secret'\].*#\$cfg\['blowfish_secret'\] = '${secret}';#" $Setup_Path/phpmyadmin_$phpmyadminExt/libraries/config.default.php
echo $1 > $Setup_Path/version.pl
if [ "${webserver}" == "nginx" ];then
sed -i "s#$Root_Path/wwwroot/default#$Root_Path/server/phpmyadmin#" $Root_Path/server/nginx/conf/nginx.conf
rm -f $Root_Path/server/nginx/conf/enable-php.conf
\cp $Root_Path/server/nginx/conf/enable-php-$PHPVersion.conf $Root_Path/server/nginx/conf/enable-php.conf
sed -i "/pathinfo/d" $Root_Path/server/nginx/conf/enable-php.conf
if [ ! -f "/www/server/nginx/conf/enable-php.conf" ];then
touch /www/server/nginx/conf/enable-php.conf
fi
/etc/init.d/nginx reload
PMA_PORT=$(cat $Root_Path/server/nginx/conf/nginx.conf|grep "listen "|grep -oE '[0-9]+')
else
sed -i "s#$Root_Path/wwwroot/default#$Root_Path/server/phpmyadmin#" $Root_Path/server/apache/conf/extra/httpd-vhosts.conf
sed -i "0,/php-cgi/ s/php-cgi-\w*\.sock/php-cgi-${PHPVersion}.sock/" $Root_Path/server/apache/conf/extra/httpd-vhosts.conf
/etc/init.d/httpd reload
PMA_PORT=$(cat /www/server/apache/conf/extra/httpd-vhosts.conf |grep "Listen "|grep -oE '[0-9]+')
fi
echo ${PMA_PORT} > /www/server/phpmyadmin/port.pl
}
Uninstall_phpMyAdmin()
{
rm -rf $Root_Path/server/phpmyadmin/phpmyadmin*
rm -f $Root_Path/server/phpmyadmin/version.pl
rm -f $Root_Path/server/phpmyadmin/version_check.pl
}
actionType=$1
version=$2
if [ "$actionType" == 'install' ];then
Install_phpMyAdmin $version
elif [ "$actionType" == 'uninstall' ];then
Uninstall_phpMyAdmin
fi