From 961cd9a6d2602d22e874cf2a360e6f1bc21f754a Mon Sep 17 00:00:00 2001 From: xiao Date: Mon, 6 Jan 2025 09:30:38 +0800 Subject: [PATCH 1/7] Update Docker image tags and build process for NAS development support --- .cnb.yml | 148 +++++++++++++++++++++++------------------------ Dockerfile | 5 ++ arm64/Dockerfile | 5 ++ arm64/bt.sh | 8 +++ bt.sh | 8 +++ 5 files changed, 100 insertions(+), 74 deletions(-) diff --git a/.cnb.yml b/.cnb.yml index 64b86ea..702cd76 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -6,84 +6,84 @@ $: build: dockerfile: .ide/Dockerfile push: - - runner: - tags: cnb:arch:amd64 - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:nas-linux-amd64 - stages: - - name: docker login - script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - - name: docker build - script: docker build -t ${IMAGE_TAG} . - - name: docker push - script: docker push ${IMAGE_TAG} - - name: resolve - type: cnb:resolve - options: - key: build-amd64 + # - runner: + # tags: cnb:arch:amd64 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas-dev-linux-amd64 + # stages: + # - name: docker login + # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + # - name: docker build + # script: docker build -t ${IMAGE_TAG} . + # - name: docker push + # script: docker push ${IMAGE_TAG} + # - name: resolve + # type: cnb:resolve + # options: + # key: build-amd64 - - runner: - tags: cnb:arch:arm64:v8 - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:nas-linux-arm64 - stages: - - name: docker login - script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - - name: docker build - script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 - - name: docker push - script: docker push ${IMAGE_TAG} - - name: resolve - type: cnb:resolve - options: - key: build-arm64 + # - runner: + # tags: cnb:arch:arm64:v8 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas-dev-linux-arm64 + # stages: + # - name: docker login + # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + # - name: docker build + # script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 + # - name: docker push + # script: docker push ${IMAGE_TAG} + # - name: resolve + # type: cnb:resolve + # options: + # key: build-arm64 - - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:nas - stages: - - name: await the amd64 - type: cnb:await - options: - key: build-amd64 - - name: await the arm64 - type: cnb:await - options: - key: build-arm64 - - name: manifest - image: cnbcool/manifest - settings: - username: $DOCKER_USERNAME - password: $DOCKER_PASSWD - target: ${IMAGE_TAG} - template: ${IMAGE_TAG}-OS-ARCH - platforms: - - linux/amd64 - - linux/arm64 - - name: clear - image: lumir/remove-dockerhub-tag - args: - - --user - - $DOCKER_USERNAME - - --password - - $DOCKER_PASSWD - - ${IMAGE_TAG}-linux-amd64 - - ${IMAGE_TAG}-linux-arm64 + # - services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:nas-dev + # stages: + # - name: await the amd64 + # type: cnb:await + # options: + # key: build-amd64 + # - name: await the arm64 + # type: cnb:await + # options: + # key: build-arm64 + # - name: manifest + # image: cnbcool/manifest + # settings: + # username: $DOCKER_USERNAME + # password: $DOCKER_PASSWD + # target: ${IMAGE_TAG} + # template: ${IMAGE_TAG}-OS-ARCH + # platforms: + # - linux/amd64 + # - linux/arm64 + # - name: clear + # image: lumir/remove-dockerhub-tag + # args: + # - --user + # - $DOCKER_USERNAME + # - --password + # - $DOCKER_PASSWD + # - ${IMAGE_TAG}-linux-amd64 + # - ${IMAGE_TAG}-linux-arm64 - runner: tags: cnb:arch:amd64 services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-amd64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev-linux-amd64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -101,7 +101,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-arm64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev-linux-arm64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -120,7 +120,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev stages: - name: await the amd64 type: cnb:await @@ -145,6 +145,6 @@ $: options: name: ${CNB_REPO_NAME} tags: - - nas-linux-amd64 - - nas-linux-arm64 + - nas-dev-linux-amd64 + - nas-dev-linux-arm64 type: docker \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 9fd7c28..fc52148 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && echo '["memuA", "memuAsite", "memuAwp", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \ && apt clean \ && rm -rf /var/lib/apt/lists/* \ + && rm -rf /www/reserve_space.pl \ && chmod +x /bt.sh \ && chmod +x /init_mysql.sh @@ -38,6 +39,10 @@ RUN echo btpanel | bt 6 \ && echo "/btpanel" > /www/server/panel/data/admin_path.pl \ && echo "root:btpaneldocker" | chpasswd +# 打包宝塔面板，并清除www +RUN tar -zcf /www.tar.gz /www \ + && rm -rf /www + ENTRYPOINT ["/bin/sh","-c","/bt.sh"] # 暴漏特定端口 diff --git a/arm64/Dockerfile b/arm64/Dockerfile index aac767c..8b756ca 100644 --- a/arm64/Dockerfile +++ b/arm64/Dockerfile @@ -28,6 +28,7 @@ RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && echo '["memuA", "memuAsite", "memuAwp", "memuAdatabase", "memuAcontrol", "memuAfiles", "memuAlogs", "memuAxterm", "memuAcrontab", "memuAsoft", "memuAconfig", "dologin", "memu_btwaf", "memuAssl"]' > /www/server/panel/config/show_menu.json \ && apt clean \ && rm -rf /var/lib/apt/lists/* \ + && rm -rf /www/reserve_space.pl \ && chmod +x /bt.sh \ && chmod +x /init_mysql.sh @@ -38,6 +39,10 @@ RUN echo btpanel | bt 6 \ && echo "/btpanel" > /www/server/panel/data/admin_path.pl \ && echo "root:btpaneldocker" | chpasswd +# 打包宝塔面板，并清除www +RUN tar -zcf /www.tar.gz /www \ + && rm -rf /www + ENTRYPOINT ["/bin/sh","-c","/bt.sh"] # 暴漏所有端口 diff --git a/arm64/bt.sh b/arm64/bt.sh index 288e69e..f01de8d 100644 --- a/arm64/bt.sh +++ b/arm64/bt.sh @@ -8,6 +8,13 @@ Setup_Path=$Root_Path/server/mysql Data_Path=$Root_Path/server/data O_pl=$(cat /www/server/panel/data/o.pl) +restore_panel_data() { + if [ -f /www.tar.gz ]; then + tar xzf /www.tar.gz -C / --skip-old-files + rm -rf /www.tar.gz + fi +} + soft_start(){ # 扫描并启动所有服务 init_scripts=$(ls ${init_path}) @@ -68,6 +75,7 @@ start_mysql(){ fi } +restore_panel_data > /dev/null is_empty_Data > /dev/null init_mysql > /dev/null start_mysql > /dev/null diff --git a/bt.sh b/bt.sh index 288e69e..f01de8d 100644 --- a/bt.sh +++ b/bt.sh @@ -8,6 +8,13 @@ Setup_Path=$Root_Path/server/mysql Data_Path=$Root_Path/server/data O_pl=$(cat /www/server/panel/data/o.pl) +restore_panel_data() { + if [ -f /www.tar.gz ]; then + tar xzf /www.tar.gz -C / --skip-old-files + rm -rf /www.tar.gz + fi +} + soft_start(){ # 扫描并启动所有服务 init_scripts=$(ls ${init_path}) @@ -68,6 +75,7 @@ start_mysql(){ fi } +restore_panel_data > /dev/null is_empty_Data > /dev/null init_mysql > /dev/null start_mysql > /dev/null From 7e0a57ab0a0802a81f92234d491323eb8a714832 Mon Sep 17 00:00:00 2001 From: xiao Date: Mon, 6 Jan 2025 12:11:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=20bt.sh=20=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AF=B9=20/www=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8F=8A=E5=85=B6=E5=AD=90=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E6=A3=80=E6=9F=A5=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=81=A2=E5=A4=8D=E6=93=8D=E4=BD=9C=E7=9A=84=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arm64/bt.sh | 6 ++++-- bt.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arm64/bt.sh b/arm64/bt.sh index f01de8d..641d257 100644 --- a/arm64/bt.sh +++ b/arm64/bt.sh @@ -10,8 +10,10 @@ O_pl=$(cat /www/server/panel/data/o.pl) restore_panel_data() { if [ -f /www.tar.gz ]; then - tar xzf /www.tar.gz -C / --skip-old-files - rm -rf /www.tar.gz + if [ ! -d /www ] || [ -z "$(ls -A /www)" ] || [ ! -d /www/server/panel ] || [ -z "$(ls -A /www/server/panel)" ] || [ ! -d /www/server/panel/pyenv ] || [ -z "$(ls -A /www/server/panel/pyenv)" ]; then + tar xzf /www.tar.gz -C / --skip-old-files + rm -rf /www.tar.gz + fi fi } diff --git a/bt.sh b/bt.sh index f01de8d..641d257 100644 --- a/bt.sh +++ b/bt.sh @@ -10,8 +10,10 @@ O_pl=$(cat /www/server/panel/data/o.pl) restore_panel_data() { if [ -f /www.tar.gz ]; then - tar xzf /www.tar.gz -C / --skip-old-files - rm -rf /www.tar.gz + if [ ! -d /www ] || [ -z "$(ls -A /www)" ] || [ ! -d /www/server/panel ] || [ -z "$(ls -A /www/server/panel)" ] || [ ! -d /www/server/panel/pyenv ] || [ -z "$(ls -A /www/server/panel/pyenv)" ]; then + tar xzf /www.tar.gz -C / --skip-old-files + rm -rf /www.tar.gz + fi fi } From f54e0a9e4142227f7d5a45e0f3ae596b32489d87 Mon Sep 17 00:00:00 2001 From: xiao Date: Mon, 6 Jan 2025 14:03:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20Dockerfile=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=AE=9D=E5=A1=94=E9=9D=A2=E6=9D=BF=E6=89=93?= =?UTF-8?q?=E5=8C=85=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc52148..2d8d683 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,8 @@ RUN echo btpanel | bt 6 \ && echo "root:btpaneldocker" | chpasswd # 打包宝塔面板，并清除www -RUN tar -zcf /www.tar.gz /www \ +RUN bt 2 \ + && tar -zcf /www.tar.gz /www \ && rm -rf /www ENTRYPOINT ["/bin/sh","-c","/bt.sh"] From 1f0da1cb82a1a56d9603283d8c57f818b5518f49 Mon Sep 17 00:00:00 2001 From: xiao Date: Tue, 7 Jan 2025 11:11:47 +0800 Subject: [PATCH 4/7] Add database backup function to bt.sh script --- arm64/bt.sh | 11 +++++++++++ bt.sh | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/arm64/bt.sh b/arm64/bt.sh index 641d257..cf1f592 100644 --- a/arm64/bt.sh +++ b/arm64/bt.sh @@ -8,6 +8,15 @@ Setup_Path=$Root_Path/server/mysql Data_Path=$Root_Path/server/data O_pl=$(cat /www/server/panel/data/o.pl) +backup_database() { + if [ -d "${Data_Path}" ] && [ ! -z "$(ls -A ${Data_Path})" ]; then + if [ ! -d /www/server/mysql ] || [ -z "$(ls -A /www/server/mysql)" ]; then + timestamp=$(date +"%Y%m%d%H%M%S") + tar czf /www/server/data_backup_$timestamp.tar.gz -C ${Data_Path} . + fi + fi +} + restore_panel_data() { if [ -f /www.tar.gz ]; then if [ ! -d /www ] || [ -z "$(ls -A /www)" ] || [ ! -d /www/server/panel ] || [ -z "$(ls -A /www/server/panel)" ] || [ ! -d /www/server/panel/pyenv ] || [ -z "$(ls -A /www/server/panel/pyenv)" ]; then @@ -77,7 +86,9 @@ start_mysql(){ fi } + restore_panel_data > /dev/null +backup_database > /dev/null is_empty_Data > /dev/null init_mysql > /dev/null start_mysql > /dev/null diff --git a/bt.sh b/bt.sh index 641d257..cf1f592 100644 --- a/bt.sh +++ b/bt.sh @@ -8,6 +8,15 @@ Setup_Path=$Root_Path/server/mysql Data_Path=$Root_Path/server/data O_pl=$(cat /www/server/panel/data/o.pl) +backup_database() { + if [ -d "${Data_Path}" ] && [ ! -z "$(ls -A ${Data_Path})" ]; then + if [ ! -d /www/server/mysql ] || [ -z "$(ls -A /www/server/mysql)" ]; then + timestamp=$(date +"%Y%m%d%H%M%S") + tar czf /www/server/data_backup_$timestamp.tar.gz -C ${Data_Path} . + fi + fi +} + restore_panel_data() { if [ -f /www.tar.gz ]; then if [ ! -d /www ] || [ -z "$(ls -A /www)" ] || [ ! -d /www/server/panel ] || [ -z "$(ls -A /www/server/panel)" ] || [ ! -d /www/server/panel/pyenv ] || [ -z "$(ls -A /www/server/panel/pyenv)" ]; then @@ -77,7 +86,9 @@ start_mysql(){ fi } + restore_panel_data > /dev/null +backup_database > /dev/null is_empty_Data > /dev/null init_mysql > /dev/null start_mysql > /dev/null From 23721bd3375b39a8b27bb76f0f112fa8939d7f0c Mon Sep 17 00:00:00 2001 From: xiao Date: Tue, 7 Jan 2025 12:13:24 +0800 Subject: [PATCH 5/7] fix: update database backup directory check path in bt.sh scripts --- arm64/bt.sh | 2 +- bt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm64/bt.sh b/arm64/bt.sh index cf1f592..c016173 100644 --- a/arm64/bt.sh +++ b/arm64/bt.sh @@ -10,7 +10,7 @@ O_pl=$(cat /www/server/panel/data/o.pl) backup_database() { if [ -d "${Data_Path}" ] && [ ! -z "$(ls -A ${Data_Path})" ]; then - if [ ! -d /www/server/mysql ] || [ -z "$(ls -A /www/server/mysql)" ]; then + if [ ! -d "${Setup_Path}" ] || [ -z "$(ls -A ${Setup_Path})" ]; then timestamp=$(date +"%Y%m%d%H%M%S") tar czf /www/server/data_backup_$timestamp.tar.gz -C ${Data_Path} . fi diff --git a/bt.sh b/bt.sh index cf1f592..c016173 100644 --- a/bt.sh +++ b/bt.sh @@ -10,7 +10,7 @@ O_pl=$(cat /www/server/panel/data/o.pl) backup_database() { if [ -d "${Data_Path}" ] && [ ! -z "$(ls -A ${Data_Path})" ]; then - if [ ! -d /www/server/mysql ] || [ -z "$(ls -A /www/server/mysql)" ]; then + if [ ! -d "${Setup_Path}" ] || [ -z "$(ls -A ${Setup_Path})" ]; then timestamp=$(date +"%Y%m%d%H%M%S") tar czf /www/server/data_backup_$timestamp.tar.gz -C ${Data_Path} . fi From 775f65d396142ab7f7d18e9a32b22a37600dab71 Mon Sep 17 00:00:00 2001 From: xiao Date: Tue, 7 Jan 2025 12:17:40 +0800 Subject: [PATCH 6/7] Update Dockerfiles to use Tencent Cloud PyPI mirror for faster pip installations --- Dockerfile | 1 + arm64/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2d8d683..7d42664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh # 下载并安装宝塔面板及 nginx RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && echo y | bash install_panel.sh -P 8888 --ssl-disable \ + && btpip config set global.index-url https://mirrors.tencent.com/pypi/simple \ && mkdir /lnmp \ && curl -o /lnmp/nginx.sh https://download.bt.cn/install/3/nginx.sh \ && bash /lnmp/nginx.sh install 1.27 \ diff --git a/arm64/Dockerfile b/arm64/Dockerfile index 8b756ca..aa54ebe 100644 --- a/arm64/Dockerfile +++ b/arm64/Dockerfile @@ -19,6 +19,7 @@ RUN dos2unix /bt.sh && dos2unix /init_mysql.sh # 下载并安装宝塔面板及 lnmp 环境 RUN curl -sSO https://download.bt.cn/install/install_panel.sh \ && echo y | bash install_panel.sh -P 8888 --ssl-disable \ + && btpip config set global.index-url https://mirrors.tencent.com/pypi/simple \ && mkdir /lnmp \ && curl -o /lnmp/nginx.sh https://download.bt.cn/install/3/nginx.sh \ && bash /lnmp/nginx.sh install openresty \ From e294fcbfbd10dc951a50e5b14d243d1ddb72c672 Mon Sep 17 00:00:00 2001 From: xiao Date: Tue, 7 Jan 2025 15:15:07 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cnb.yml | 148 +++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/.cnb.yml b/.cnb.yml index 702cd76..64b86ea 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -6,84 +6,84 @@ $: build: dockerfile: .ide/Dockerfile push: - # - runner: - # tags: cnb:arch:amd64 - # services: - # - docker - # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - # env: - # IMAGE_TAG: btpanel/baota:nas-dev-linux-amd64 - # stages: - # - name: docker login - # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - # - name: docker build - # script: docker build -t ${IMAGE_TAG} . - # - name: docker push - # script: docker push ${IMAGE_TAG} - # - name: resolve - # type: cnb:resolve - # options: - # key: build-amd64 + - runner: + tags: cnb:arch:amd64 + services: + - docker + imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + env: + IMAGE_TAG: btpanel/baota:nas-linux-amd64 + stages: + - name: docker login + script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + - name: docker build + script: docker build -t ${IMAGE_TAG} . + - name: docker push + script: docker push ${IMAGE_TAG} + - name: resolve + type: cnb:resolve + options: + key: build-amd64 - # - runner: - # tags: cnb:arch:arm64:v8 - # services: - # - docker - # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - # env: - # IMAGE_TAG: btpanel/baota:nas-dev-linux-arm64 - # stages: - # - name: docker login - # script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" - # - name: docker build - # script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 - # - name: docker push - # script: docker push ${IMAGE_TAG} - # - name: resolve - # type: cnb:resolve - # options: - # key: build-arm64 + - runner: + tags: cnb:arch:arm64:v8 + services: + - docker + imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + env: + IMAGE_TAG: btpanel/baota:nas-linux-arm64 + stages: + - name: docker login + script: docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWD" + - name: docker build + script: docker build -t ${IMAGE_TAG} -f ./arm64/Dockerfile ./arm64 + - name: docker push + script: docker push ${IMAGE_TAG} + - name: resolve + type: cnb:resolve + options: + key: build-arm64 - # - services: - # - docker - # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - # env: - # IMAGE_TAG: btpanel/baota:nas-dev - # stages: - # - name: await the amd64 - # type: cnb:await - # options: - # key: build-amd64 - # - name: await the arm64 - # type: cnb:await - # options: - # key: build-arm64 - # - name: manifest - # image: cnbcool/manifest - # settings: - # username: $DOCKER_USERNAME - # password: $DOCKER_PASSWD - # target: ${IMAGE_TAG} - # template: ${IMAGE_TAG}-OS-ARCH - # platforms: - # - linux/amd64 - # - linux/arm64 - # - name: clear - # image: lumir/remove-dockerhub-tag - # args: - # - --user - # - $DOCKER_USERNAME - # - --password - # - $DOCKER_PASSWD - # - ${IMAGE_TAG}-linux-amd64 - # - ${IMAGE_TAG}-linux-arm64 + - services: + - docker + imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + env: + IMAGE_TAG: btpanel/baota:nas + stages: + - name: await the amd64 + type: cnb:await + options: + key: build-amd64 + - name: await the arm64 + type: cnb:await + options: + key: build-arm64 + - name: manifest + image: cnbcool/manifest + settings: + username: $DOCKER_USERNAME + password: $DOCKER_PASSWD + target: ${IMAGE_TAG} + template: ${IMAGE_TAG}-OS-ARCH + platforms: + - linux/amd64 + - linux/arm64 + - name: clear + image: lumir/remove-dockerhub-tag + args: + - --user + - $DOCKER_USERNAME + - --password + - $DOCKER_PASSWD + - ${IMAGE_TAG}-linux-amd64 + - ${IMAGE_TAG}-linux-arm64 - runner: tags: cnb:arch:amd64 services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev-linux-amd64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-amd64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -101,7 +101,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev-linux-arm64 + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-linux-arm64 stages: - name: docker login script: docker login -u ${CNB_TOKEN_USER_NAME} -p "${CNB_TOKEN}" ${CNB_DOCKER_REGISTRY} @@ -120,7 +120,7 @@ $: services: - docker env: - IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas-dev + IMAGE_TAG: ${CNB_DOCKER_REGISTRY}/${CNB_REPO_SLUG_LOWERCASE}:nas stages: - name: await the amd64 type: cnb:await @@ -145,6 +145,6 @@ $: options: name: ${CNB_REPO_NAME} tags: - - nas-dev-linux-amd64 - - nas-dev-linux-arm64 + - nas-linux-amd64 + - nas-linux-arm64 type: docker \ No newline at end of file