feat: 更新构建和推送工作流,添加 Node.js 和 Go 环境设置,优化 Docker 镜像构建流程
fix: 修复 order-api.yaml 中的格式问题 refactor: 在多个逻辑文件中重新排序导入语句,确保一致性
This commit is contained in:
@@ -10,17 +10,34 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IMAGE_NAME: st-1-example
|
GO_VERSION: "1.24"
|
||||||
|
NODE_VERSION: "22"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
docker-build-push:
|
docker-build-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
|
||||||
image_tag: ${{ steps.vars.outputs.short_sha }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: ${{ env.NODE_VERSION }}
|
||||||
|
|
||||||
|
- name: Setup Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: ${{ env.GO_VERSION }}
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Install goctl
|
||||||
|
run: |
|
||||||
|
go install github.com/zeromicro/go-zero/tools/goctl@latest
|
||||||
|
echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
|
||||||
|
|
||||||
- name: Set image tags
|
- name: Set image tags
|
||||||
id: vars
|
id: vars
|
||||||
run: |
|
run: |
|
||||||
@@ -35,79 +52,68 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "$HARBOR_PASSWORD" | docker login "$HARBOR_REGISTRY" -u "$HARBOR_USERNAME" --password-stdin
|
echo "$HARBOR_PASSWORD" | docker login "$HARBOR_REGISTRY" -u "$HARBOR_USERNAME" --password-stdin
|
||||||
|
|
||||||
- name: Build image
|
- name: Discover docker targets
|
||||||
|
id: targets
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
: > docker-targets.txt
|
||||||
|
|
||||||
|
while IFS= read -r service_dir; do
|
||||||
|
service_name="$(basename "$service_dir")"
|
||||||
|
|
||||||
|
while IFS= read -r svc_dir; do
|
||||||
|
svc_type="$(basename "$svc_dir")"
|
||||||
|
if [[ "$svc_type" == "rpc" ]]; then
|
||||||
|
go_entry="$svc_dir/pb.go"
|
||||||
|
else
|
||||||
|
go_entry="$svc_dir/$service_name.go"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f "$go_entry" ]]; then
|
||||||
|
echo "$go_entry" >> docker-targets.txt
|
||||||
|
fi
|
||||||
|
done < <(find "$service_dir" -mindepth 1 -maxdepth 1 -type d | sort)
|
||||||
|
|
||||||
|
done < <(find app -mindepth 1 -maxdepth 1 -type d | sort)
|
||||||
|
|
||||||
|
target_count="$(wc -l < docker-targets.txt | tr -d ' ')"
|
||||||
|
echo "count=$target_count" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "Found $target_count docker targets"
|
||||||
|
cat docker-targets.txt
|
||||||
|
|
||||||
|
- name: Generate Dockerfile, build and push images
|
||||||
|
if: steps.targets.outputs.count != '0'
|
||||||
env:
|
env:
|
||||||
HARBOR_REGISTRY: ${{ secrets.HARBOR_REGISTRY }}
|
HARBOR_REGISTRY: ${{ secrets.HARBOR_REGISTRY }}
|
||||||
HARBOR_PROJECT: ${{ secrets.HARBOR_PROJECT }}
|
HARBOR_PROJECT: ${{ secrets.HARBOR_PROJECT }}
|
||||||
|
SHORT_SHA: ${{ steps.vars.outputs.short_sha }}
|
||||||
|
DATE_TAG: ${{ steps.vars.outputs.date_tag }}
|
||||||
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
IMAGE="$HARBOR_REGISTRY/$HARBOR_PROJECT/$IMAGE_NAME"
|
set -euo pipefail
|
||||||
docker build -f Dockerfile -t "$IMAGE:${{ steps.vars.outputs.short_sha }}" -t "$IMAGE:${{ steps.vars.outputs.date_tag }}" -t "$IMAGE:latest" .
|
|
||||||
|
|
||||||
- name: Push image
|
while IFS= read -r target; do
|
||||||
env:
|
[[ -z "$target" ]] && continue
|
||||||
HARBOR_REGISTRY: ${{ secrets.HARBOR_REGISTRY }}
|
|
||||||
HARBOR_PROJECT: ${{ secrets.HARBOR_PROJECT }}
|
|
||||||
run: |
|
|
||||||
IMAGE="$HARBOR_REGISTRY/$HARBOR_PROJECT/$IMAGE_NAME"
|
|
||||||
docker push "$IMAGE:${{ steps.vars.outputs.short_sha }}"
|
|
||||||
docker push "$IMAGE:${{ steps.vars.outputs.date_tag }}"
|
|
||||||
docker push "$IMAGE:latest"
|
|
||||||
|
|
||||||
deploy-server-docker:
|
service_name="$(echo "$target" | cut -d'/' -f2)"
|
||||||
runs-on: ubuntu-latest
|
svc_type="$(echo "$target" | cut -d'/' -f3)"
|
||||||
needs: docker-build-push
|
image_name="${service_name}-${svc_type}"
|
||||||
if: github.ref_name == 'main' || github.ref_name == 'master'
|
image_ref="$HARBOR_REGISTRY/$HARBOR_PROJECT/$image_name"
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup SSH key
|
echo "==== Building $image_name from $target ===="
|
||||||
env:
|
npx hereby -t docker -s "$target"
|
||||||
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
printf "%s" "$DEPLOY_SSH_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
|
|
||||||
- name: Add server host key
|
docker build \
|
||||||
env:
|
-f Dockerfile \
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
-t "$image_ref:$SHORT_SHA" \
|
||||||
DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
|
-t "$image_ref:$DATE_TAG" \
|
||||||
run: |
|
-t "$image_ref:latest" \
|
||||||
PORT="${DEPLOY_PORT:-22}"
|
.
|
||||||
ssh-keyscan -p "$PORT" "$DEPLOY_HOST" >> ~/.ssh/known_hosts
|
|
||||||
|
|
||||||
- name: Upload compose file
|
docker push "$image_ref:$SHORT_SHA"
|
||||||
env:
|
docker push "$image_ref:$DATE_TAG"
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
docker push "$image_ref:latest"
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
|
||||||
DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
|
|
||||||
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
|
|
||||||
run: |
|
|
||||||
PORT="${DEPLOY_PORT:-22}"
|
|
||||||
TARGET_PATH="${DEPLOY_PATH:-/opt/st-1-example}"
|
|
||||||
ssh -p "$PORT" "$DEPLOY_USER@$DEPLOY_HOST" "mkdir -p $TARGET_PATH"
|
|
||||||
scp -P "$PORT" deploy/docker/docker-compose.yml "$DEPLOY_USER@$DEPLOY_HOST:$TARGET_PATH/docker-compose.yml"
|
|
||||||
|
|
||||||
- name: Deploy on server
|
rm -f Dockerfile
|
||||||
env:
|
done < docker-targets.txt
|
||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
|
||||||
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
|
|
||||||
DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
|
|
||||||
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
|
|
||||||
HARBOR_REGISTRY: ${{ secrets.HARBOR_REGISTRY }}
|
|
||||||
HARBOR_PROJECT: ${{ secrets.HARBOR_PROJECT }}
|
|
||||||
HARBOR_USERNAME: ${{ secrets.HARBOR_USERNAME }}
|
|
||||||
HARBOR_PASSWORD: ${{ secrets.HARBOR_PASSWORD }}
|
|
||||||
run: |
|
|
||||||
PORT="${DEPLOY_PORT:-22}"
|
|
||||||
TARGET_PATH="${DEPLOY_PATH:-/opt/st-1-example}"
|
|
||||||
IMAGE_TAG="${{ needs.docker-build-push.outputs.image_tag }}"
|
|
||||||
ssh -p "$PORT" "$DEPLOY_USER@$DEPLOY_HOST" "
|
|
||||||
set -e;
|
|
||||||
cd $TARGET_PATH;
|
|
||||||
echo '$HARBOR_PASSWORD' | docker login '$HARBOR_REGISTRY' -u '$HARBOR_USERNAME' --password-stdin;
|
|
||||||
HARBOR_REGISTRY='$HARBOR_REGISTRY' HARBOR_PROJECT='$HARBOR_PROJECT' IMAGE_NAME='$IMAGE_NAME' IMAGE_TAG='$IMAGE_TAG' docker compose pull;
|
|
||||||
HARBOR_REGISTRY='$HARBOR_REGISTRY' HARBOR_PROJECT='$HARBOR_PROJECT' IMAGE_NAME='$IMAGE_NAME' IMAGE_TAG='$IMAGE_TAG' docker compose up -d;
|
|
||||||
docker image prune -f;
|
|
||||||
"
|
|
||||||
|
|||||||
@@ -16,4 +16,3 @@ PlayerRpcConf:
|
|||||||
|
|
||||||
ShopRpcConf:
|
ShopRpcConf:
|
||||||
Target: k8s://juwan/shop-rpc-svc:8080
|
Target: k8s://juwan/shop-rpc-svc:8080
|
||||||
|
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
package svc
|
package svc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"juwan-backend/app/order/api/internal/config"
|
||||||
"juwan-backend/app/order/rpc/orderservice"
|
"juwan-backend/app/order/rpc/orderservice"
|
||||||
"juwan-backend/app/player/rpc/playerservice"
|
"juwan-backend/app/player/rpc/playerservice"
|
||||||
"juwan-backend/app/shop/rpc/shopservice"
|
"juwan-backend/app/shop/rpc/shopservice"
|
||||||
"juwan-backend/app/order/api/internal/config"
|
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/zrpc"
|
"github.com/zeromicro/go-zero/zrpc"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,11 +5,12 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/shopspring/decimal"
|
|
||||||
"juwan-backend/app/order/rpc/internal/svc"
|
"juwan-backend/app/order/rpc/internal/svc"
|
||||||
"juwan-backend/app/order/rpc/pb"
|
"juwan-backend/app/order/rpc/pb"
|
||||||
"juwan-backend/app/snowflake/rpc/snowflake"
|
"juwan-backend/app/snowflake/rpc/snowflake"
|
||||||
|
|
||||||
|
"github.com/shopspring/decimal"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,10 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/shopspring/decimal"
|
|
||||||
"juwan-backend/app/order/rpc/internal/models"
|
"juwan-backend/app/order/rpc/internal/models"
|
||||||
"juwan-backend/app/order/rpc/pb"
|
"juwan-backend/app/order/rpc/pb"
|
||||||
|
|
||||||
|
"github.com/shopspring/decimal"
|
||||||
)
|
)
|
||||||
|
|
||||||
func parseDecimal(v string) (decimal.Decimal, error) {
|
func parseDecimal(v string) (decimal.Decimal, error) {
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ package logic
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"juwan-backend/app/order/rpc/internal/svc"
|
|
||||||
"juwan-backend/app/order/rpc/internal/models/orderstatelogs"
|
"juwan-backend/app/order/rpc/internal/models/orderstatelogs"
|
||||||
|
"juwan-backend/app/order/rpc/internal/svc"
|
||||||
"juwan-backend/app/order/rpc/pb"
|
"juwan-backend/app/order/rpc/pb"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
|
|||||||
@@ -4,10 +4,11 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/shopspring/decimal"
|
|
||||||
"juwan-backend/app/order/rpc/internal/svc"
|
"juwan-backend/app/order/rpc/internal/svc"
|
||||||
"juwan-backend/app/order/rpc/pb"
|
"juwan-backend/app/order/rpc/pb"
|
||||||
|
|
||||||
|
"github.com/shopspring/decimal"
|
||||||
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -5,15 +5,16 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"ariga.io/entcache"
|
|
||||||
"entgo.io/ent/dialect/sql"
|
|
||||||
"github.com/zeromicro/go-zero/core/logx"
|
|
||||||
"juwan-backend/app/order/rpc/internal/config"
|
"juwan-backend/app/order/rpc/internal/config"
|
||||||
"juwan-backend/app/order/rpc/internal/models"
|
"juwan-backend/app/order/rpc/internal/models"
|
||||||
"juwan-backend/app/snowflake/rpc/snowflake"
|
"juwan-backend/app/snowflake/rpc/snowflake"
|
||||||
"juwan-backend/common/redisx"
|
"juwan-backend/common/redisx"
|
||||||
"juwan-backend/common/snowflakex"
|
"juwan-backend/common/snowflakex"
|
||||||
"juwan-backend/pkg/adapter"
|
"juwan-backend/pkg/adapter"
|
||||||
|
|
||||||
|
"ariga.io/entcache"
|
||||||
|
"entgo.io/ent/dialect/sql"
|
||||||
|
"github.com/zeromicro/go-zero/core/logx"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ServiceContext struct {
|
type ServiceContext struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user