From f6a622270887636c636b12799d10805b3df574f1 Mon Sep 17 00:00:00 2001
From: tech-fever <105153585+tech-fever@users.noreply.github.com>
Date: Sun, 29 May 2022 11:25:14 +0800
Subject: [PATCH 1/4] Create Docker Hub build and push workflow

---
 .github/workflows/docker-image.yml | 56 ++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000000..02f9af6c4e
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,56 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ main ]
+#   pull_request:
+#     branches: [ main ]
+
+# jobs:
+
+#   build:
+
+#     runs-on: ubuntu-latest
+
+#     steps:
+#     - uses: actions/checkout@v3
+#     - name: Build the Docker image
+#       run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
+
+jobs:
+
+  Docker:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+        
+      - uses: docker/setup-qemu-action@v1
+      
+      - uses: docker/setup-buildx-action@v1
+      
+      - uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - uses: docker/metadata-action@v3
+        id: meta
+        with:
+          images: techfever/xui
+          flavor: |
+            latest=auto
+          tags: |
+            type=edge,branch=main
+            type=match,pattern=v(.*),group=0
+            type=ref,event=pr
+      
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}

From e464627e8443218fff423b7ccc02c5007abc4413 Mon Sep 17 00:00:00 2001
From: tech-fever <105153585+tech-fever@users.noreply.github.com>
Date: Sun, 29 May 2022 11:27:05 +0800
Subject: [PATCH 2/4] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 02f9af6c4e..02b1308afe 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -33,8 +33,8 @@ jobs:
       
       - uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       
       - uses: docker/metadata-action@v3
         id: meta

From 5e4d6335fda26cd302f6dd38a5a2a6d8635e55c3 Mon Sep 17 00:00:00 2001
From: tech-fever <105153585+tech-fever@users.noreply.github.com>
Date: Sun, 29 May 2022 11:55:00 +0800
Subject: [PATCH 3/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 80a9e302df..2c5afd4353 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ docker run -itd --network=host \
     -v $PWD/db/:/etc/x-ui/ \
     -v $PWD/cert/:/root/cert/ \
     --name x-ui --restart=unless-stopped \
-    enwaiax/x-ui:latest
+    techfever/x-ui:edge
 ```
 
 > Build 自己的镜像

From 7e01196982bee9b3f8b36039d4210f644b20f92a Mon Sep 17 00:00:00 2001
From: tech-fever <105153585+tech-fever@users.noreply.github.com>
Date: Sun, 29 May 2022 12:11:10 +0800
Subject: [PATCH 4/4] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 02b1308afe..a9a86e1d0b 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -39,7 +39,7 @@ jobs:
       - uses: docker/metadata-action@v3
         id: meta
         with:
-          images: techfever/xui
+          images: techfever/x-ui
           flavor: |
             latest=auto
           tags: |