diff --git a/.cnb.yml b/.cnb.yml index 975ba67..e578e24 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -12,7 +12,7 @@ $: - docker imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml env: - IMAGE_TAG: btpanel/baota:latest-linux-amd64 + IMAGE_TAG: btpanel/baota:alpine-linux-amd64 stages: - name: docker login script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" @@ -31,7 +31,7 @@ $: - docker imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml env: - IMAGE_TAG: btpanel/baota:latest-linux-arm64 + IMAGE_TAG: btpanel/baota:alpine-linux-arm64 stages: - name: docker login script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" @@ -48,7 +48,7 @@ $: - docker imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml env: - IMAGE_TAG: btpanel/baota:latest + IMAGE_TAG: btpanel/baota:alpine stages: - name: await the amd64 type: cnb:await @@ -83,7 +83,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:alpine-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}:alpine-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}:alpine stages: - name: await the amd64 type: cnb:await @@ -145,6 +145,6 @@ $: options: name: ${CNB_REPO_NAME} tags: - - latest-linux-amd64 - - latest-linux-arm64 + - alpine-linux-amd64 + - alpine-linux-arm64 type: docker \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d78fe04..6b6721b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,9 @@ -FROM debian:bookworm +FROM alpine -# 切换 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 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 \ - && apt clean \ - && rm -rf /var/lib/apt/lists/* +# 切换 alpine 镜像源为腾讯云源,更新包列表并安装依赖 +RUN apk update && apk upgrade -y \ + && apk add libffi-dev openssl-dev shadow bash zlib-dev g++ make sqlite-dev libpcap jpeg-dev dos2unix \ + && apk cache clean # 复制脚本 COPY ["bt.sh", "init_mysql.sh", "/"] @@ -25,7 +15,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh 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 \ + && echo "docker_bt_alpine" > /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/* \