Merge pull request #155 from aipeach/dev

Update build_meta_image.yml
AirportR · Feb 4, 2024 · 78ab265 · 78ab265
2 parents ff3d3b6 + b55c3bd
commit 78ab265
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/build_meta_image.yml b/.github/workflows/build_meta_image.yml
@@ -1,7 +1,12 @@
 name: build_meta_image
 
 on:
-  workflow_dispatch:
+  push:
+    paths:
+      - 'docker/Metafile'
+      - 'docker/Metafile.alpine'
+    branches:
+      - "dev"
 
 jobs:
   docker:
@@ -40,4 +45,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ env.IMAGE }}:alpine
+            ${{ env.IMAGE }}:alpine
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -41,9 +41,11 @@ jobs:
           push: true
           tags: |
             ${{ env.IMAGE }}:latest
+            ${{ env.IMAGE }}:debian-${{ github.ref_name }}
           build-args: |
             GIT_Branch=${{ github.ref_name }}
       - name: Build Debian Image
+        if: ${{ github.ref_name != 'dev' }}
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
@@ -52,8 +54,6 @@ jobs:
           push: true
           tags: |
             ${{ env.IMAGE }}:debian-${{ github.ref_name }}
-          build-args: |
-            GIT_Branch=${{ github.ref_name }}
       - name: Build Alpine Image
         uses: docker/build-push-action@v5
         with:

diff --git a/docker/README.md b/docker/README.md
@@ -40,7 +40,7 @@ docker pull airportr/fulltclash:latest
 - debian-dev
 - alpine-dev
 - debian-master
-- debian-master
+- alpine-master
 
 ### docker
 
@@ -59,7 +59,7 @@ docker run -idt \
    -e core=4 \
    -e startup=1124 \
    -e speedthread=4 \
-   -e nospeed=true \
+   -e nospeed=false \
    -e s5_proxy=127.0.0.1:7890 \
    -e http_proxy=127.0.0.1:7890 \
    --network=host \