feat: 更新构建流程

This commit is contained in:
xiao 2024-11-25 12:42:15 +08:00
parent 9d4a6b0d94
commit 23ae28fa4d
3 changed files with 16 additions and 16 deletions

View File

@ -5,17 +5,17 @@ $:
docker: docker:
build: build:
dockerfile: .ide/Dockerfile dockerfile: .ide/Dockerfile
bullseye:
push: push:
- runner: - runner:
tags: cnb:arch:amd64 tags: cnb:arch:amd64
services: services:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:lamp_debian12-linux-amd64 IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}-linux-amd64
stages: stages:
- name: docker login - name: docker login
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
- name: docker build - name: docker build
script: docker build -t ${IMAGE_TAG} . script: docker build -t ${IMAGE_TAG} .
- name: docker push - name: docker push
@ -30,12 +30,11 @@ $:
cpus: 16 cpus: 16
services: services:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:lamp_debian12-linux-arm64 IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}-linux-arm64
stages: stages:
- name: docker login - name: docker login
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY}
- name: docker build - name: docker build
timeout: 3600s timeout: 3600s
script: docker build -t ${IMAGE_TAG} . script: docker build -t ${IMAGE_TAG} .
@ -45,12 +44,13 @@ $:
type: cnb:resolve type: cnb:resolve
options: options:
key: build-arm64 key: build-arm64
- runner:
- services: tags: cnb:arch:amd64
cpus: 2
services:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:lamp_debian12 IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:${CNB_BRANCH}
stages: stages:
- name: await the amd64 - name: await the amd64
type: cnb:await type: cnb:await
@ -63,8 +63,8 @@ $:
- name: manifest - name: manifest
image: cnbcool/manifest image: cnbcool/manifest
settings: settings:
username: $DOCKER_USERNAME username: $CNB_TOKEN_USER_NAME
password: $DOCKER_PASSWD password: $CNB_TOKEN
target: ${IMAGE_TAG} target: ${IMAGE_TAG}
template: ${IMAGE_TAG}-OS-ARCH template: ${IMAGE_TAG}-OS-ARCH
platforms: platforms:

View File

@ -1,7 +1,7 @@
FROM debian:bookworm FROM debian:bullseye
# 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖 # 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list.d/debian.sources \ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
&& apt update && apt upgrade -y \ && apt update && apt upgrade -y \
&& apt install -y \ && apt install -y \
locales \ locales \
@ -40,7 +40,7 @@ RUN curl -o /lamp/apache.sh https://download.bt.cn/install/0/apache.sh \
&& rm -rf /www/server/mysql/src \ && rm -rf /www/server/mysql/src \
&& rm -rf /www/server/data/* \ && rm -rf /www/server/data/* \
&& rm -rf /www/server/apache/src \ && rm -rf /www/server/apache/src \
&& echo "docker_btlamp_d12" > /www/server/panel/data/o.pl \ && 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 \ && echo '["memuA", "memuAsite", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \
&& apt clean \ && apt clean \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \

2
bt.sh
View File

@ -38,7 +38,7 @@ soft_start(){
} }
init_mysql(){ init_mysql(){
if [ "${O_pl}" != "docker_btlamp_d12" ] && [ "${O_pl}" != "docker_btlnmp_d12" ];then if [ "${O_pl}" != "docker_btlamp_d11" ] && [ "${O_pl}" != "docker_btlnmp_d11" ];then
return return
fi fi
if [ -d "${Data_Path}" ]; then if [ -d "${Data_Path}" ]; then