From 16159ef4c4cb472b79de007786981019890a6377 Mon Sep 17 00:00:00 2001
From: Opnxng <opnxng@tuta.io>
Date: Mon, 17 Jun 2024 10:42:07 +0800
Subject: [PATCH] Updated workflows

---
 .gitea/workflows/ansible.yaml         | 15 ++++-----------
 .gitea/workflows/binternet.yaml       | 15 ++++-----------
 .gitea/workflows/caddy.yaml           | 15 ++++-----------
 .gitea/workflows/etherpad.yaml        | 15 ++++-----------
 .gitea/workflows/imgin.yaml           | 15 ++++-----------
 .gitea/workflows/proxigram.yaml       | 15 ++++-----------
 .gitea/workflows/rat-aint-tieba.yaml  | 15 ++++-----------
 .gitea/workflows/scribe.yaml          | 15 ++++-----------
 .gitea/workflows/searxng.yaml         | 18 +++++-------------
 .gitea/workflows/simplytranslate.yaml | 15 ++++-----------
 .gitea/workflows/wolfree.yaml         | 15 ++++-----------
 dockerfiles/docker-buildx.Dockerfile  |  1 -
 12 files changed, 45 insertions(+), 124 deletions(-)

diff --git a/.gitea/workflows/ansible.yaml b/.gitea/workflows/ansible.yaml
index aa87d1e..be79fdf 100644
--- a/.gitea/workflows/ansible.yaml
+++ b/.gitea/workflows/ansible.yaml
@@ -16,11 +16,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -34,19 +31,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/dockerfiles/ansible.Dockerfile -o Dockerfile
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/binternet.yaml b/.gitea/workflows/binternet.yaml
index 69da30d..7ab8a28 100644
--- a/.gitea/workflows/binternet.yaml
+++ b/.gitea/workflows/binternet.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,19 +30,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             git clone ${REMOTE_REPO} .
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -53,7 +46,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/caddy.yaml b/.gitea/workflows/caddy.yaml
index 9e3bfc1..8c22522 100644
--- a/.gitea/workflows/caddy.yaml
+++ b/.gitea/workflows/caddy.yaml
@@ -16,11 +16,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -34,19 +31,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/dockerfiles/caddy.Dockerfile -o Dockerfile
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/etherpad.yaml b/.gitea/workflows/etherpad.yaml
index aef1149..1eadb40 100644
--- a/.gitea/workflows/etherpad.yaml
+++ b/.gitea/workflows/etherpad.yaml
@@ -16,11 +16,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -34,19 +31,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/dockerfiles/etherpad.Dockerfile -o Dockerfile
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/imgin.yaml b/.gitea/workflows/imgin.yaml
index 54c8256..5c388b5 100644
--- a/.gitea/workflows/imgin.yaml
+++ b/.gitea/workflows/imgin.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,19 +30,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             git clone ${REMOTE_REPO} .
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -53,7 +46,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/proxigram.yaml b/.gitea/workflows/proxigram.yaml
index e83f4bd..006dc19 100644
--- a/.gitea/workflows/proxigram.yaml
+++ b/.gitea/workflows/proxigram.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,12 +30,8 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
@@ -46,7 +39,7 @@ jobs:
             cd temp
             git clone ${REMOTE_REPO} .
             curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/copy/proxigram.env -o .env
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/rat-aint-tieba.yaml b/.gitea/workflows/rat-aint-tieba.yaml
index 1a65ba5..a0b68a6 100644
--- a/.gitea/workflows/rat-aint-tieba.yaml
+++ b/.gitea/workflows/rat-aint-tieba.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,12 +30,8 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
@@ -46,7 +39,7 @@ jobs:
             cd temp
             git clone ${REMOTE_REPO} .
             git checkout no-masters # Use no-masters branch
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/scribe.yaml b/.gitea/workflows/scribe.yaml
index 5fa37a6..3eb0a30 100644
--- a/.gitea/workflows/scribe.yaml
+++ b/.gitea/workflows/scribe.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,12 +30,8 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
@@ -46,7 +39,7 @@ jobs:
             cd temp
             git clone ${REMOTE_REPO} .
             # use Dockerfile.arm64
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile.arm64 \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/searxng.yaml b/.gitea/workflows/searxng.yaml
index b2f5876..d3ecb80 100644
--- a/.gitea/workflows/searxng.yaml
+++ b/.gitea/workflows/searxng.yaml
@@ -1,6 +1,7 @@
 name: searxng
 run-name: searxng
 env:
+  REPO_NAME: searxng
   REMOTE_REPO: https://github.com/searxng/searxng.git
   BUILD_PLATFORM: linux/arm64
 on:
@@ -14,13 +15,8 @@ jobs:
   build-searxng:
     runs-on: runner
     container:
-      image: docker:cli
-    env:
-      REPO_NAME: searxng
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -34,19 +30,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             curl -JL https://git.opnxng.com/opnxng/docker-images/raw/branch/main/dockerfiles/searxng.Dockerfile -o Dockerfile
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +46,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/simplytranslate.yaml b/.gitea/workflows/simplytranslate.yaml
index dcf0bcb..5528590 100644
--- a/.gitea/workflows/simplytranslate.yaml
+++ b/.gitea/workflows/simplytranslate.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,19 +30,15 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
             mkdir temp
             cd temp
             git clone ${REMOTE_REPO} .
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -53,7 +46,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/.gitea/workflows/wolfree.yaml b/.gitea/workflows/wolfree.yaml
index d961da5..f420749 100644
--- a/.gitea/workflows/wolfree.yaml
+++ b/.gitea/workflows/wolfree.yaml
@@ -15,11 +15,8 @@ jobs:
   build:
     runs-on: runner
     container:
-      image: docker:cli
+      image: git.opnxng.com/opnxng/docker-buildx:latest
     steps:
-      - name: Install packages
-        run: apk --no-cache add curl git jq
-
       - name: Check latest upstream commit
         run: |
           STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
@@ -33,12 +30,8 @@ jobs:
         run: |
           if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
             echo "Found a new commit, building new image"
-            # Install Docker Buildx
-            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
-            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
-            chmod +x /usr/bin/docker-buildx
             # Create and use Docker Buildx builder
-            docker-buildx create --use --name buildx
+            docker buildx create --use --name buildx
             # Login to Package Registry
             echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
             # Build and push Docker image
@@ -46,7 +39,7 @@ jobs:
             cd temp
             git clone ${REMOTE_REPO} .
             sed -i '/^RUN PATH="$HOME\/.cargo\/bin:$PATH" cargo run --manifest-path \.\/rust\/wolfree_libredirect_patch\/Cargo\.toml -- ;$/s/^#//' Dockerfile # Make Libredirect-compatible
-            docker-buildx build \
+            docker buildx build \
               --platform ${BUILD_PLATFORM} \
               -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
               -f ./Dockerfile \
@@ -54,7 +47,7 @@ jobs:
               curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
               { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
             # Remove Docker Buildx builder
-            docker-buildx rm buildx
+            docker buildx rm buildx
           else
             echo "No new commit, skipped build"
           fi
diff --git a/dockerfiles/docker-buildx.Dockerfile b/dockerfiles/docker-buildx.Dockerfile
index 819149f..7368eb5 100644
--- a/dockerfiles/docker-buildx.Dockerfile
+++ b/dockerfiles/docker-buildx.Dockerfile
@@ -2,4 +2,3 @@ FROM docker:cli
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 RUN apk add --no-cache curl git jq
 RUN rm -rf /var/cache/apk/*
-