From 131f0c6ba7d4e0567ebac88f4f1f6c1e7c91e561 Mon Sep 17 00:00:00 2001
From: xiaohei <3440556848@qq.com>
Date: Sun, 16 Feb 2025 08:04:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BD=BF=E7=94=A8kaniko=20ac?=
 =?UTF-8?q?tions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/docker-build.yml | 52 +++++++++++++++++++------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
index f5575b0..0e21776 100644
--- a/.gitea/workflows/docker-build.yml
+++ b/.gitea/workflows/docker-build.yml
@@ -9,7 +9,7 @@ on:
       - main
 
 env:
-  REGISTRY_USER: admin
+  REGISTRY_USERNAME: admin
   REGISTRY_PASSWORD: 6nkTT9Th5z6gR?ro
   IMAGE_REGISTRY: hub.docker.xiaohei.one
   PROJECT_NAME: test-devops
@@ -24,27 +24,39 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: install podman
-        run: apt update && apt install podman -y
 
-      - name: 创建非特权用户
-        run: |
-          # 2. 创建用户 (如果需要)
-          adduser podmanuser
-          
-          # 3. 配置 subuid/subgid
-          echo "podmanuser:100000:65536" >> /etc/subuid
-          echo "podmanuser:100000:65536" >> /etc/subgid
-
-          # 4. 切换到非 root 用户
-          su - podmanuser
-
-      - uses: redhat-actions/buildah-build@v2
+       - name: Build and Push
+        uses: gcr.io/kaniko-project/executor@latest # 使用官方 Kaniko Action
         with:
-          image: my-new-image
-          tags: v1 ${{ gitea.sha }}
-          dockerfiles: |
-            ./Dockerfile
+          context: .
+          dockerfile: Dockerfile
+          destination: test-devops:0.0.1 
+          registry: ${{ IMAGE_REGISTRY }}
+          username: ${{ REGISTRY_USERNAME }}
+          password: ${{ REGISTRY_PASSWORD }}
+
+
+      # - name: install podman
+      #   run: apt update && apt install podman -y
+
+      # - name: 创建非特权用户
+      #   run: |
+      #     # 2. 创建用户 (如果需要)
+      #     adduser podmanuser
+          
+      #     # 3. 配置 subuid/subgid
+      #     echo "podmanuser:100000:65536" >> /etc/subuid
+      #     echo "podmanuser:100000:65536" >> /etc/subgid
+
+      #     # 4. 切换到非 root 用户
+      #     su - podmanuser
+
+      # - uses: redhat-actions/buildah-build@v2
+      #   with:
+      #     image: my-new-image
+      #     tags: v1 ${{ gitea.sha }}
+      #     dockerfiles: |
+      #       ./Dockerfile