Update Docker build and push process, system identification, and Dockerfile for CentOS 7.9

This commit is contained in:
xiao 2024-12-04 11:30:24 +08:00
parent 4351cf8cbd
commit f8b13a1d0c
3 changed files with 36 additions and 29 deletions

View File

@ -5,17 +5,17 @@ $:
docker: docker:
build: build:
dockerfile: .ide/Dockerfile dockerfile: .ide/Dockerfile
cent7.9:
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:latest_debian11-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
@ -27,15 +27,16 @@ $:
- runner: - runner:
tags: cnb:arch:arm64:v8 tags: cnb:arch:arm64:v8
cpus: 16
services: services:
- docker - docker
imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml
env: env:
IMAGE_TAG: btpanel/baota:latest_debian11-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
script: docker build -t ${IMAGE_TAG} . script: docker build -t ${IMAGE_TAG} .
- name: docker push - name: docker push
script: docker push ${IMAGE_TAG} script: docker push ${IMAGE_TAG}
@ -43,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:latest_debian11 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
@ -61,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,19 +1,24 @@
FROM debian:bullseye FROM centos:centos7.9.2009
# 切换 Debian 镜像源为腾讯云源,更新包列表并安装依赖 # 切换 CentOS 镜像源为腾讯云源,更新包列表并安装依赖
RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \ RUN sed -e "s|^mirrorlist=|#mirrorlist=|g" \
&& apt update && apt upgrade -y \ -e "s|^#baseurl=http://mirror.centos.org/centos/\$releasever|baseurl=https://mirrors.tencent.com/centos-vault/\$releasever|g" \
&& apt install -y \ -e "s|^#baseurl=http://mirror.centos.org/\$contentdir/\$releasever|baseurl=https://mirrors.tencent.com/centos-vault/\$releasever|g" \
locales \ -i.bak \
wget iproute2 openssh-server libgd-dev cmake make gcc g++ autoconf \ /etc/yum.repos.d/CentOS-*.repo \
libsodium-dev libonig-dev libssh2-1-dev libc-ares-dev libaio-dev sudo curl dos2unix \ && yum clean all \
build-essential re2c cron bzip2 libzip-dev libc6-dev bison file rcconf flex vim m4 gawk less cpp binutils \ && yum makecache \
diffutils unzip tar libbz2-dev libncurses5 libncurses5-dev libtool libevent-dev libssl-dev libsasl2-dev \ && yum update -y \
libltdl-dev zlib1g-dev libglib2.0-0 libglib2.0-dev libkrb5-dev libpq-dev libpq5 gettext libcap-dev \ && yum install -y \
libc-client2007e-dev psmisc patch git e2fsprogs libxslt1-dev xz-utils libgd3 libwebp-dev libvpx-dev \ glibc-locale-source \
libfreetype6-dev libjpeg62-turbo libjpeg62-turbo-dev iptables libudev-dev libldap2-dev \ wget iproute openssh-server gd-devel cmake make gcc gcc-c++ autoconf \
&& apt clean \ libsodium-devel oniguruma-devel libssh2-devel c-ares-devel libaio-devel sudo curl dos2unix \
&& rm -rf /var/lib/apt/lists/* bzip2 zip unzip tar ncurses-devel libtool libevent-devel openssl-devel cyrus-sasl-devel \
libtool-ltdl-devel zlib-devel glib2 glib2-devel krb5-devel postgresql-devel gettext libcap-devel \
uw-imap-devel psmisc patch git e2fsprogs libxslt-devel xz libwebp-devel libvpx-devel \
freetype-devel libjpeg-turbo libjpeg-turbo-devel iptables systemd-devel openldap-devel \
&& yum clean all \
&& rm -rf /var/cache/yum
# 复制脚本 # 复制脚本
COPY ["bt.sh", "init_mysql.sh", "/"] COPY ["bt.sh", "init_mysql.sh", "/"]
@ -25,7 +30,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
&& echo y | bash install_panel.sh -P 8888 --ssl-disable \ && echo y | bash install_panel.sh -P 8888 --ssl-disable \
&& rm -rf /www/server/data/* \ && rm -rf /www/server/data/* \
&& echo "docker_bt_d11" > /www/server/panel/data/o.pl \ && echo "docker_bt_c79" > /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_d11" ] && [ "${O_pl}" != "docker_btlnmp_d11" ];then if [ "${O_pl}" != "docker_btlamp_c79" ] && [ "${O_pl}" != "docker_btlnmp_c79" ];then
return return
fi fi
if [ -d "${Data_Path}" ]; then if [ -d "${Data_Path}" ]; then