From 3f9c6bf406f76687f484fb959f4886d9291d101d Mon Sep 17 00:00:00 2001 From: xiao Date: Mon, 16 Dec 2024 11:27:07 +0800 Subject: [PATCH] Update Docker image tags and build process for NAS support --- .cnb.yml | 152 ++++++++++++++++++++++---------------------- Dockerfile | 16 ++--- arm64/Dockerfile | 46 ++++++++++++++ arm64/bt.sh | 76 ++++++++++++++++++++++ arm64/init_mysql.sh | 41 ++++++++++++ bt.sh | 2 +- 6 files changed, 247 insertions(+), 86 deletions(-) create mode 100644 arm64/Dockerfile create mode 100644 arm64/bt.sh create mode 100644 arm64/init_mysql.sh diff --git a/.cnb.yml b/.cnb.yml index 975ba67..d17233e 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -5,85 +5,85 @@ $: docker: build: dockerfile: .ide/Dockerfile - push: - - runner: - tags: cnb:arch:amd64 - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:latest-linux-amd64 - stages: - - name: docker login - script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - - name: docker build - script: docker build -t ${IMAGE_TAG} . - - name: docker push - script: docker push ${IMAGE_TAG} - - name: resolve - type: cnb:resolve - options: - key: build-amd64 + # push: + # - runner: + # tags: cnb:arch:amd64 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas-linux-amd64 + # stages: + # - name: docker login + # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + # - name: docker build + # script: docker build -t ${IMAGE_TAG} . + # - name: docker push + # script: docker push ${IMAGE_TAG} + # - name: resolve + # type: cnb:resolve + # options: + # key: build-amd64 - - runner: - tags: cnb:arch:arm64:v8 - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:latest-linux-arm64 - stages: - - name: docker login - script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - - name: docker build - script: docker build -t ${IMAGE_TAG} . - - name: docker push - script: docker push ${IMAGE_TAG} - - name: resolve - type: cnb:resolve - options: - key: build-arm64 + # - runner: + # tags: cnb:arch:arm64:v8 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas-linux-arm64 + # stages: + # - name: docker login + # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + # - name: docker build + # script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 + # - name: docker push + # script: docker push ${IMAGE_TAG} + # - name: resolve + # type: cnb:resolve + # options: + # key: build-arm64 - - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:latest - stages: - - name: await the amd64 - type: cnb:await - options: - key: build-amd64 - - name: await the arm64 - type: cnb:await - options: - key: build-arm64 - - name: manifest - image: cnbcool/manifest - settings: - username: $DOCKER_USERNAME - password: $DOCKER_PASSWD - target: ${IMAGE_TAG} - template: ${IMAGE_TAG}-OS-ARCH - platforms: - - linux/amd64 - - linux/arm64 - - name: clear - image: lumir/remove-dockerhub-tag - args: - - --user - - $DOCKER_USERNAME - - --password - - $DOCKER_PASSWD - - ${IMAGE_TAG}-linux-amd64 - - ${IMAGE_TAG}-linux-arm64 + # - services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas + # stages: + # - name: await the amd64 + # type: cnb:await + # options: + # key: build-amd64 + # - name: await the arm64 + # type: cnb:await + # options: + # key: build-arm64 + # - name: manifest + # image: cnbcool/manifest + # settings: + # username: $DOCKER_USERNAME + # password: $DOCKER_PASSWD + # target: ${IMAGE_TAG} + # template: ${IMAGE_TAG}-OS-ARCH + # platforms: + # - linux/amd64 + # - linux/arm64 + # - name: clear + # image: lumir/remove-dockerhub-tag + # args: + # - --user + # - $DOCKER_USERNAME + # - --password + # - $DOCKER_PASSWD + # - ${IMAGE_TAG}-linux-amd64 + # - ${IMAGE_TAG}-linux-arm64 - runner: tags: cnb:arch:amd64 services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-amd64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -101,12 +101,12 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-arm64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-arm64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} - name: docker build - script: docker build -t ${IMAGE_TAG} . + script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 - name: docker push script: docker push ${IMAGE_TAG} - name: resolve @@ -120,7 +120,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas stages: - name: await the amd64 type: cnb:await @@ -145,6 +145,6 @@ $: options: name: ${CNB_REPO_NAME} tags: - - latest-linux-amd64 - - latest-linux-arm64 + - nas-linux-amd64 + - nas-linux-arm64 type: docker \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d78fe04..bdcf0dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,7 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debi && 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 \ - build-essential re2c cron bzip2 libzip-dev libc6-dev bison file rcconf flex vim m4 gawk less cpp binutils \ - 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 iptables libudev-dev libldap2-dev \ + wget openssh-server cmake make gcc g++ autoconf sudo curl dos2unix build-essential \ && apt clean \ && rm -rf /var/lib/apt/lists/* @@ -24,8 +18,12 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh # 下载并安装宝塔面板及 lnmp 环境 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && echo y | bash install_panel.sh -P 8888 --ssl-disable \ - && rm -rf /www/server/data/* \ - && echo "docker_bt_d12" > /www/server/panel/data/o.pl \ + && mkdir /lnmp \ + && curl -o /lnmp/nginx.sh https://download.bt.cn/install/3/nginx.sh \ + && bash /lnmp/nginx.sh install 1.27 \ + && rm -rf /lnmp \ + && rm -rf /www/server/nginx/src \ + && echo "docker_bt_nas" > /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/* \ diff --git a/arm64/Dockerfile b/arm64/Dockerfile new file mode 100644 index 0000000..bdcf0dc --- /dev/null +++ b/arm64/Dockerfile @@ -0,0 +1,46 @@ +FROM debian:bookworm + +# 切换 Debian 镜像源为腾讯云源，更新包列表并安装依赖 +RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \ + && apt update && apt upgrade -y \ + && apt install -y \ + locales \ + wget openssh-server cmake make gcc g++ autoconf sudo curl dos2unix build-essential \ + && apt clean \ + && rm -rf /var/lib/apt/lists/* + +# 复制脚本 +COPY ["bt.sh", "init_mysql.sh", "/"] + +# 转换启动脚本 +RUN dos2unix /bt.sh && dos2unix /init_mysql.sh + +# 下载并安装宝塔面板及 lnmp 环境 +RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ + && echo y | bash install_panel.sh -P 8888 --ssl-disable \ + && mkdir /lnmp \ + && curl -o /lnmp/nginx.sh https://download.bt.cn/install/3/nginx.sh \ + && bash /lnmp/nginx.sh install 1.27 \ + && rm -rf /lnmp \ + && rm -rf /www/server/nginx/src \ + && echo "docker_bt_nas" > /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 \ + && echo "root:btpaneldocker" | chpasswd + +ENTRYPOINT ["/bin/sh","-c","/bt.sh"] + +# 暴漏所有端口 +EXPOSE 0-65535 + +# 健康检查 +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 \ No newline at end of file diff --git a/arm64/bt.sh b/arm64/bt.sh new file mode 100644 index 0000000..288e69e --- /dev/null +++ b/arm64/bt.sh @@ -0,0 +1,76 @@ +#!/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_nas" ] && [ "${O_pl}" != "docker_btlnmp_nas" ];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 + bash /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 \ No newline at end of file diff --git a/arm64/init_mysql.sh b/arm64/init_mysql.sh new file mode 100644 index 0000000..f773276 --- /dev/null +++ b/arm64/init_mysql.sh @@ -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<