From 95e23e9c294d33a5f9434b77f955f15ce6dca4da Mon Sep 17 00:00:00 2001 From: xiao Date: Tue, 17 Dec 2024 16:30:48 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cnb.yml | 140 ++++++++++++++++++++++++++--------------------------- Dockerfile | 2 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.cnb.yml b/.cnb.yml index e578e24..cf3b50e 100644 --- a/.cnb.yml +++ b/.cnb.yml @@ -6,77 +6,77 @@ $: 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:alpine-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:alpine-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:alpine-linux-arm64 - 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-arm64 + # - runner: + # tags: cnb:arch:arm64:v8 + # services: + # - docker + # imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml + # env: + # IMAGE_TAG: btpanel/baota:alpine-linux-arm64 + # 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-arm64 - - services: - - docker - imports: https://cnb.cool/btpanel/secret/-/blob/main/docker.yml - env: - IMAGE_TAG: btpanel/baota:alpine - 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:alpine + # 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 @@ -106,7 +106,7 @@ $: - 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} -f ./arm64/Dockerfile ./arm64 + script: docker build -t ${IMAGE_TAG} . - name: docker push script: docker push ${IMAGE_TAG} - name: resolve diff --git a/Dockerfile b/Dockerfile index aae984b..bbc76ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine # 切换 alpine 镜像源为腾讯云源，更新包列表并安装依赖 RUN apk update && apk upgrade \ - && apk add curl libffi-dev openssl-dev shadow bash zlib-dev g++ make sqlite-dev libpcap jpeg-dev dos2unix \ + && apk add curl libffi-dev openssl-dev shadow bash zlib-dev g++ make sqlite-dev libpcap jpeg-dev dos2unix libev-dev \ && apk cache clean # 复制脚本