From ff16d29b8ddc3d240d5ea3b8eefb24871d1317cf Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Wed, 22 Oct 2025 09:36:10 -0700 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=9B=B4=E6=96=B0Docker=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B8=85=E7=90=86?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新TG_CHAT_ID环境变量值 - 简化构建容器镜像配置，使用基础node镜像 - 删除无用的push.sh脚本 - 清理build_docker.sh中的测试容器运行命令 --- .gitea/workflows/docker.yml | 6 ++---- push.sh | 23 ----------------------- script/build_docker.sh | 11 +---------- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 push.sh diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 4f2168a..5ac132c 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -21,7 +21,7 @@ env: SSH_PASSWORD: ${{ vars.SSH_PASSWORD }} # TG通知 TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0 - TG_CHAT_ID: "-4940243803" + TG_CHAT_ID: "-4940243803-11" # Go构建变量 SERVICE: ario SERVICE_STYLE: ario @@ -33,9 +33,7 @@ jobs: build: runs-on: ario-server container: - # 使用包含 Docker、curl、jq、Node.js 的镜像 - image: cimg/node:20.15.1 - options: --privileged + image: node:20 strategy: matrix: # 只有node支持版本号别名 diff --git a/push.sh b/push.sh deleted file mode 100644 index d6289e2..0000000 --- a/push.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# build-and-push.sh - -set -e - -# cd /Users/Apple/code2025/server -cd /Users/Apple/vpn/ppanel-server -# 固定版本号为latest -VERSION=latest - -# 构建镜像 -echo "Building image with version: $VERSION" -docker build -f Dockerfile --platform linux/amd64 --build-arg TARGETARCH=amd64 -t registry.kxsw.us/ppanel/ppanel-server:$VERSION . -docker tag registry.kxsw.us/ppanel/ppanel-server:$VERSION registry.kxsw.us/ppanel/ppanel-server:latest - -# 推送镜像 -echo "Pushing image to registry.kxsw.us" -docker push registry.kxsw.us/ppanel/ppanel-server:$VERSION -docker push registry.kxsw.us/ppanel/ppanel-server:latest - - -echo "Build and push completed successfully!" -# docker-compose exec certbot certbot certonly --webroot --webroot-path=/etc/letsencrypt -d api-dev.kxsw.us diff --git a/script/build_docker.sh b/script/build_docker.sh index 5388586..9d9b1ae 100755 --- a/script/build_docker.sh +++ b/script/build_docker.sh @@ -18,13 +18,4 @@ docker push registry.kxsw.us/ppanel/ario-server:$VERSION docker push registry.kxsw.us/ppanel/ario-server:$VERSION echo "Build and push completed successfully!" -# docker-compose exec certbot certbot certonly --webroot --webroot-path=/etc/letsencrypt -d api-dev.kxsw.us - -docker run -d -p 3001:3000 \ - -e NEXT_PUBLIC_DEFAULT_LANGUAGE=en-US \ - -e NEXT_PUBLIC_SITE_URL=https://4d3vsw8.88xgaen.hifast.biz \ - -e NEXT_PUBLIC_API_URL=https://api.hifast.biz \ - -e NEXT_PUBLIC_DEFAULT_USER_EMAIL=admin@ppanel.dev \ - -e NEXT_PUBLIC_DEFAULT_USER_PASSWORD=password \ - --name ppanel-admin-web \ - ppanel/ppanel-admin-web:latest \ No newline at end of file +# docker-compose exec certbot certbot certonly --webroot --webroot-path=/etc/letsencrypt -d api-dev.kxsw.us \ No newline at end of file