change

.github/workflows/build-frp.yml

@@ -36,28 +36,28 @@ jobs:
         uses: docker/build-push-action@v5
         id: docker_build_frps
         with:
-          context: ./frp
-          file: ./frp/Dockerfile.server
+          context: ./frps
+          file: ./frps/Dockerfile.server
           push: true
           tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/frp:server
-            ${{ secrets.DOCKER_HUB_USERNAME }}/frp:${{ env.FRP_VERSION }}-server
-            ghcr.io/${{ github.repository }}/frp:server
-            ghcr.io/${{ github.repository }}/frp:${{ env.FRP_VERSION }}-server
+            ${{ secrets.DOCKER_HUB_USERNAME }}/frps:latest
+            ${{ secrets.DOCKER_HUB_USERNAME }}/frps:${{ env.FRP_VERSION }}
+            ghcr.io/${{ github.repository }}/frps:latest
+            ghcr.io/${{ github.repository }}/frps:${{ env.FRP_VERSION }}
           builder: ${{ steps.buildx.outputs.name }}
 
       - name: Build frpc and push
         uses: docker/build-push-action@v5
         id: docker_build_frpc
         with:
-          context: ./frp
-          file: ./frp/Dockerfile.client
+          context: ./frpc
+          file: ./frpc/Dockerfile.client
           push: true
           tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/frp:client
-            ${{ secrets.DOCKER_HUB_USERNAME }}/frp:${{ env.FRP_VERSION }}-client
-            ghcr.io/${{ github.repository }}/frp:client
-            ghcr.io/${{ github.repository }}/frp:${{ env.FRP_VERSION }}-client
+            ${{ secrets.DOCKER_HUB_USERNAME }}/frpc:latest
+            ${{ secrets.DOCKER_HUB_USERNAME }}/frpc:${{ env.FRP_VERSION }}
+            ghcr.io/${{ github.repository }}/frpc:latest
+            ghcr.io/${{ github.repository }}/frpc:${{ env.FRP_VERSION }}
           builder: ${{ steps.buildx.outputs.name }}
 
       - name: Image digest

frp/Dockerfile.client → frpc/Dockerfile.client

@@ -1,6 +1,5 @@
 # syntax=docker/dockerfile:1
 FROM playn/alpine
-# ARG version=0.37.0
 RUN export version=$(wget -qO- https://api.github.com/repos/fatedier/frp/releases/latest | grep '"tag_name":' | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/v//g;s/,//g;s/ //g') && \
     wget --quiet -O /tmp/frp.tar.gz https://github.com/fatedier/frp/releases/download/v${version}/frp_${version}_linux_amd64.tar.gz && \
     tar zxf /tmp/frp.tar.gz -C /tmp && \

frp/Dockerfile.server → frps/Dockerfile.server

@@ -1,6 +1,5 @@
 # syntax=docker/dockerfile:1
 FROM playn/alpine
-# ARG version=0.37.0
 RUN export version=$(wget -qO- https://api.github.com/repos/fatedier/frp/releases/latest | grep '"tag_name":' | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/v//g;s/,//g;s/ //g') && \
     wget --quiet -O /tmp/frp.tar.gz https://github.com/fatedier/frp/releases/download/v${version}/frp_${version}_linux_amd64.tar.gz && \
     tar zxf /tmp/frp.tar.gz -C /tmp && \