From 03a3701ff4776d971eac7ed466a6ec4e51576291 Mon Sep 17 00:00:00 2001 From: xiao Date: Mon, 9 Dec 2024 14:30:10 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20.cnb.yml=20?= =?UTF-8?q?=E5=92=8C=20bt.sh=20=E6=96=87=E4=BB=B6=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E6=9E=B6=E6=9E=84=E6=9E=84=E5=BB=BA=E5=92=8C?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cnb.yml | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- bt.sh | 2 +- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/.cnb.yml b/.cnb.yml index 27b357b..b944c49 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -76,4 +76,64 @@ $: - --password - $DOCKER_PASSWD - ${IMAGE_TAG}-linux-amd64 - - ${IMAGE_TAG}-linux-arm64 \ No newline at end of file + - ${IMAGE_TAG}-linux-arm64 + + - runner: + tags: cnb:arch:amd64 + services: + - docker + env: + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-linux-amd64 + 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} . + - name: docker push + script: docker push ${IMAGE_TAG} + - name: resolve + type: cnb:resolve + options: + key: cnb-build-amd64 + + - runner: + tags: cnb:arch:arm64:v8 + services: + - docker + env: + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest-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} . + - name: docker push + script: docker push ${IMAGE_TAG} + - name: resolve + type: cnb:resolve + options: + key: cnb-build-arm64 + + - services: + - docker + env: + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:latest + stages: + - name: await the amd64 + type: cnb:await + options: + key: cnb-build-amd64 + - name: await the arm64 + type: cnb:await + options: + key: cnb-build-arm64 + - name: manifest + image: cnbcool/manifest + settings: + username: $CNB_TOKEN_USER_NAME + password: $CNB_TOKEN + target: ${IMAGE_TAG} + template: ${IMAGE_TAG}-OS-ARCH + platforms: + - linux/amd64 + - linux/arm64 \ No newline at end of file diff --git a/bt.sh b/bt.sh index 101e6c9..f00d486 100644 --- a/bt.sh +++ b/bt.sh @@ -51,7 +51,7 @@ init_mysql(){ fi fi if [ -f /init_mysql.sh ] && [ -d "${Setup_Path}" ];then - sh /init_mysql.sh + bash /init_mysql.sh rm -f /init_mysql.sh fi }