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 }