修改了安装docker方法13

.gitea/workflows/build.yml

@@ -21,9 +21,9 @@ env:
 # 构建 Job
 jobs:
   build:
-    runs-on: ubuntu-node24 # 如果host构建 ：linux_amd64
-#    container:
-#      image: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/ghcr.io/catthehacker/ubuntu:act-latest
+    runs-on: ubuntu-node22 # 如果host构建 ：linux_amd64
+    #    container:
+    #      image: swr.cn-north-4.myhuaweicloud.com/ddn-k8s/ghcr.io/catthehacker/ubuntu:act-latest
     steps:
       - name: Print system info 1
         run: echo " The job was automatically triggered by a ${{ gitea.event_name }} event."
@@ -34,21 +34,28 @@ jobs:
       - name: Print env
         run: env
       - name: Install dependencies
-        run: apt-get update && apt-get install -y gettext && apt-get install -y maven && apt-get install -y docker.io
+        run: |
+             apt-get update &&
+             apt-get install -y gettext &&
+             apt-get install -y maven &&
+             apt-get install -y sudo &&
+             apt-get install -y iptables
+      - name: Set up Docker
+        uses: http://139.9.216.111:3000/bamanker/setup-docker-action@v4
       - name: Generate maven config
         uses: http://139.9.216.111:3000/bamanker/maven-settings-action@v3.1.0
         with:
           mirrors: '[{"id": "alimaven", "name": "aliyun maven", "mirrorOf": "central", "url": "http://maven.aliyun.com/nexus/content/groups/public/"}]'
 
       #      - uses: http://localhost:3000/bamanker/setup-node@v6
-#        with:
-#          node-version: 24
-#          cache: 'npm'
-#      - run: node -v
+      #        with:
+      #          node-version: 24
+      #          cache: 'npm'
+      #      - run: node -v
       # 下载仓库源码，依赖node环境，因此构建服务器本地需要下载安装node并设置环境变量
 
-#      - name: Set up Docker Buildx
-#        uses: http://139.9.216.111:3000/bamanker/setup-buildx-action@v3
+      #      - name: Set up Docker Buildx
+      #        uses: http://139.9.216.111:3000/bamanker/setup-buildx-action@v3
 
       - name: Checkout repository code
         #使用自定义仓库action
@@ -67,8 +74,8 @@ jobs:
         run: |
           echo "The app version is $APP_TAG" && echo "tag=$APP_TAG" >> $GITHUB_OUTPUT  && 
           echo "now workspace: ${{ github.workspace }}" &&
-          pwd &&
-          docker -v
+          docker version &&
+          docker --help 
 
       # 为其他配置文件注入环境变量
       - name: Inject envVar
@@ -105,18 +112,22 @@ jobs:
 
       # 构建并上传镜像 TODO 直接用docker命令操作
       - name: Build and push Docker image
-#        uses: http://139.9.216.111:3000/bamanker/build-push-action@v4 # 获取上一步截取到的版本号，既 1.0.0
+        #        uses: http://139.9.216.111:3000/bamanker/build-push-action@v4 # 获取上一步截取到的版本号，既 1.0.0
         #只能这样接收
         env:
           TAG: ${{ steps.set_envar.outputs.tag }}
         run: |
-          docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} --push .
-#        with:
-#          context: .
-##          platforms: linux/amd64
-#          file: Dockerfile
-#          push: true
-#          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
+          ls &&
+          docker build --file Dockerfile --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} . &&
+          docker image ls
+#          ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} --push.
+      #        uses: http://139.9.216.111:3000/bamanker/docker-build-push@v5
+      #        with:
+      #          context: .
+      ##          platforms: linux/amd64
+      #          file: Dockerfile
+      #          push: true
+      #          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
 
       #发布到 k8s
       - name: Generate kubeconfig