diff --git a/.cnb.yml b/.cnb.yml index 975ba67..190eb84 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -6,84 +6,84 @@ $: 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 + # - runner: + # tags: cnb:arch:amd64 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:9.0_lts_fresh-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:9.0_lts_fresh-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 - - 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:9.0_lts_fresh + # 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}:9.0_lts_fresh-linux-amd64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -101,7 +101,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-arm64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:9.0_lts_fresh-linux-arm64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -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}:9.0_lts_fresh stages: - name: await the amd64 type: cnb:await @@ -145,6 +145,6 @@ $: options: name: ${CNB_REPO_NAME} tags: - - latest-linux-amd64 - - latest-linux-arm64 + - 9.0_lts_fresh-linux-amd64 + - 9.0_lts_fresh-linux-arm64 type: docker \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 077636d..4b80e74 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/* @@ -22,11 +16,11 @@ 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 \ +RUN curl -sSO https://download.bt.cn/install/install_lts.sh \ + && echo y | bash install_lts.sh -P 8888 --ssl-disable \ && btpip config set global.index-url https://mirrors.tencent.com/pypi/simple \ && rm -rf /www/server/data/* \ - && echo "docker_bt_d12" > /www/server/panel/data/o.pl \ + && echo "docker_bt_ltsd12" > /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/bt.sh b/bt.sh index dc19ae3..363a612 100644 --- a/bt.sh +++ b/bt.sh @@ -56,7 +56,7 @@ soft_start(){ } init_mysql(){ - if [ "${O_pl}" != "docker_btlamp_d12" ] && [ "${O_pl}" != "docker_btlnmp_d12" ];then + if [ "${O_pl}" != "docker_btlamp_ltsd12" ] && [ "${O_pl}" != "docker_btlnmp_ltsd12" ];then return fi if [ -d "${Data_Path}" ]; then