Update .cnb.yml and Dockerfiles for timeout configuration, script adjustments, and ARM64 architecture support
This commit is contained in:
parent
e1e95d2a9c
commit
a064b0a9f1
3
.cnb.yml
3
.cnb.yml
@ -17,6 +17,7 @@ $:
|
|||||||
- name: docker login
|
- name: docker login
|
||||||
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
|
script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD"
|
||||||
- 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}
|
||||||
@ -46,7 +47,7 @@ $:
|
|||||||
options:
|
options:
|
||||||
key: build-arm64
|
key: build-arm64
|
||||||
- runner:
|
- runner:
|
||||||
tags: cnb:arch:amd64:v8
|
tags: cnb:arch:amd64
|
||||||
cpus: 2
|
cpus: 2
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
@ -17,10 +17,10 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
|
|||||||
|
|
||||||
# 复制脚本
|
# 复制脚本
|
||||||
COPY ["bt.sh", "init_mysql.sh", "/"]
|
COPY ["bt.sh", "init_mysql.sh", "/"]
|
||||||
COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"]
|
COPY ["phpmyadmin.sh", "/lnmp/"]
|
||||||
|
|
||||||
# 转换启动脚本
|
# 转换启动脚本
|
||||||
RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh
|
RUN dos2unix /bt.sh && dos2unix /init_mysql.sh
|
||||||
|
|
||||||
# 下载并安装宝塔面板及 lnmp 环境
|
# 下载并安装宝塔面板及 lnmp 环境
|
||||||
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
|
RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
|
||||||
@ -29,6 +29,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
|
|||||||
&& sh /lnmp/nginx.sh install 1.27 \
|
&& sh /lnmp/nginx.sh install 1.27 \
|
||||||
&& curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
|
&& curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
|
||||||
&& sh /lnmp/php.sh install 8.3 \
|
&& sh /lnmp/php.sh install 8.3 \
|
||||||
|
&& curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \
|
||||||
&& sh /lnmp/mysql.sh install 8.0 \
|
&& sh /lnmp/mysql.sh install 8.0 \
|
||||||
&& sh /lnmp/phpmyadmin.sh install 5.2 \
|
&& sh /lnmp/phpmyadmin.sh install 5.2 \
|
||||||
&& rm -rf /lnmp \
|
&& rm -rf /lnmp \
|
||||||
|
@ -17,7 +17,7 @@ RUN sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list \
|
|||||||
|
|
||||||
# 复制脚本
|
# 复制脚本
|
||||||
COPY ["bt.sh", "init_mysql.sh", "/"]
|
COPY ["bt.sh", "init_mysql.sh", "/"]
|
||||||
COPY ["phpmyadmin.sh","mysql.sh", "/lnmp/"]
|
COPY ["phpmyadmin.sh", "/lnmp/"]
|
||||||
|
|
||||||
# 转换启动脚本
|
# 转换启动脚本
|
||||||
RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh
|
RUN dos2unix /bt.sh && dos2unix /init_mysql.sh && dos2unix /lnmp/phpmyadmin.sh && dos2unix /lnmp/mysql.sh
|
||||||
@ -29,6 +29,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \
|
|||||||
&& sh /lnmp/nginx.sh install openresty \
|
&& sh /lnmp/nginx.sh install openresty \
|
||||||
&& curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
|
&& curl -o /lnmp/php.sh https://download.bt.cn/install/3/php.sh \
|
||||||
&& sh /lnmp/php.sh install 8.3 \
|
&& sh /lnmp/php.sh install 8.3 \
|
||||||
|
&& curl -o /lnmp/mysql.sh https://download.bt.cn/install/3/mysql.sh \
|
||||||
&& sh /lnmp/mysql.sh install 8.0 \
|
&& sh /lnmp/mysql.sh install 8.0 \
|
||||||
&& sh /lnmp/phpmyadmin.sh install 5.2 \
|
&& sh /lnmp/phpmyadmin.sh install 5.2 \
|
||||||
&& rm -rf /lnmp \
|
&& rm -rf /lnmp \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user