fix: 解决 deploy.yml 冲突

This commit is contained in:
2026-07-19 20:13:05 +08:00
parent b80e4c01f5
commit 1789141a7b
+9 -8
View File
@@ -27,7 +27,8 @@ jobs:
- name: Set up JDK 17 - name: Set up JDK 17
run: | run: |
apk add --no-cache openjdk17-jdk sudo apt-get update -qq
sudo apt-get install -y -qq openjdk-17-jdk
java -version java -version
- name: Build with Maven - name: Build with Maven
@@ -39,7 +40,7 @@ jobs:
- name: Build & Push Docker image - name: Build & Push Docker image
run: | run: |
apk add --no-cache docker-cli apt-get install -y -qq docker.io
TAG=${{ gitea.sha }} TAG=${{ gitea.sha }}
docker build -t $REGISTRY/$APP:$TAG -t $REGISTRY/$APP:${{ inputs.environment }} . docker build -t $REGISTRY/$APP:$TAG -t $REGISTRY/$APP:${{ inputs.environment }} .
docker push $REGISTRY/$APP:$TAG docker push $REGISTRY/$APP:$TAG
@@ -47,20 +48,20 @@ jobs:
- name: Setup kubectl - name: Setup kubectl
run: | run: |
apk add --no-cache curl
curl -sLO "https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl" curl -sLO "https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl"
chmod +x kubectl chmod +x kubectl
mv kubectl /usr/local/bin/ mv kubectl /usr/local/bin/
echo "${{ secrets.KUBECONFIG_B64 }}" | base64 -d > /tmp/kubeconfig mkdir -p ~/.kube
echo "${{ secrets.KUBECONFIG_B64 }}" | base64 -d > ~/.kube/config
- name: Deploy to K8s - name: Deploy to K8s
run: | run: |
TAG=${{ gitea.sha }} TAG=${{ gitea.sha }}
kubectl --kubeconfig=/tmp/kubeconfig set image deployment/$APP $APP=$REGISTRY/$APP:$TAG -n lpt-${{ inputs.environment }} --record kubectl set image deployment/$APP $APP=$REGISTRY/$APP:$TAG -n lpt-${{ inputs.environment }} --record
kubectl --kubeconfig=/tmp/kubeconfig rollout status deployment/$APP -n lpt-${{ inputs.environment }} --timeout=5m kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }} --timeout=5m
- name: Rollback on failure - name: Rollback on failure
if: failure() if: failure()
run: | run: |
kubectl --kubeconfig=/tmp/kubeconfig rollout undo deployment/$APP -n lpt-${{ inputs.environment }} kubectl rollout undo deployment/$APP -n lpt-${{ inputs.environment }}
kubectl --kubeconfig=/tmp/kubeconfig rollout status deployment/$APP -n lpt-${{ inputs.environment }} kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }}