♻️ refactor(runner): simplify shell helpers and workflow scripts
This commit is contained in:
@@ -20,6 +20,24 @@ mkdir -p "$PERSISTENT_BIN"
|
||||
mkdir -p /var/log/supervisor
|
||||
mkdir -p /var/run
|
||||
|
||||
create_buildx_builder() {
|
||||
docker buildx create \
|
||||
--name gitea-multiarch \
|
||||
--driver docker-container \
|
||||
--bootstrap \
|
||||
--use \
|
||||
--config /data/buildx/buildkitd.toml 2>/dev/null || \
|
||||
docker buildx use gitea-multiarch 2>/dev/null
|
||||
}
|
||||
|
||||
ensure_buildx_builder() {
|
||||
docker buildx use gitea-multiarch 2>/dev/null || {
|
||||
echo "⚠ Recreating Buildx builder..."
|
||||
docker buildx rm gitea-multiarch 2>/dev/null || true
|
||||
create_buildx_builder
|
||||
}
|
||||
}
|
||||
|
||||
# ============================================
|
||||
# 初始化 Docker Buildx 支持(可选)
|
||||
# ============================================
|
||||
@@ -104,13 +122,7 @@ if [ "$ENABLE_BUILDX" = "true" ]; then
|
||||
EOF
|
||||
|
||||
# 创建 Buildx builder
|
||||
docker buildx create \
|
||||
--name gitea-multiarch \
|
||||
--driver docker-container \
|
||||
--bootstrap \
|
||||
--use \
|
||||
--config /data/buildx/buildkitd.toml 2>/dev/null || \
|
||||
docker buildx use gitea-multiarch 2>/dev/null
|
||||
create_buildx_builder
|
||||
|
||||
# 验证
|
||||
echo "Verifying Buildx..."
|
||||
@@ -125,15 +137,7 @@ EOF
|
||||
echo "✓ Buildx already configured"
|
||||
|
||||
# 确保 builder 可用
|
||||
docker buildx use gitea-multiarch 2>/dev/null || {
|
||||
echo "⚠ Recreating Buildx builder..."
|
||||
docker buildx rm gitea-multiarch 2>/dev/null || true
|
||||
docker buildx create \
|
||||
--name gitea-multiarch \
|
||||
--driver docker-container \
|
||||
--bootstrap \
|
||||
--use 2>/dev/null
|
||||
}
|
||||
ensure_buildx_builder
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user