XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-05-08 15:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 01f994625dd974653fc74970f56152a3c5e310ce into 8593eff752117aaa3775db498eb0e553a251c4f6

Browse Source
This commit is contained in:
wuai1024 2024-11-20 16:25:28 +09:00 committed by GitHub
commit b464209b7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build-and-push-image.yml vendored
View File

@ -53,12 +53,10 @@ jobs:
# prepare image tags # prepare image tags
- name: Prepare Image Tags - name: Prepare Image Tags
run: | run: |
echo "DOCKERFILE_FRPC_PATH=dockerfiles/Dockerfile-for-frpc" >> $GITHUB_ENV echo "TAG_FRPC=${{ github.repository_owner }}/frpc" >> $GITHUB_ENV
echo "DOCKERFILE_FRPS_PATH=dockerfiles/Dockerfile-for-frps" >> $GITHUB_ENV echo "TAG_FRPS=${{ github.repository_owner }}/frps" >> $GITHUB_ENV
echo "TAG_FRPC=fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV echo "TAG_FRPC_GPR=ghcr.io/${{ github.repository_owner }}/frpc" >> $GITHUB_ENV
echo "TAG_FRPS=fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV echo "TAG_FRPS_GPR=ghcr.io/${{ github.repository_owner }}/frps" >> $GITHUB_ENV
echo "TAG_FRPC_GPR=ghcr.io/fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV
echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV
- name: Build and push frpc - name: Build and push frpc
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
@ -68,8 +66,10 @@ jobs:
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
${{ env.TAG_FRPC }} ${{ env.TAG_FRPC }}:${{ env.TAG_NAME }}
${{ env.TAG_FRPC_GPR }} ${{ env.TAG_FRPC }}:latest
${{ env.TAG_FRPC_GPR }}:${{ env.TAG_NAME }}
${{ env.TAG_FRPC_GPR }}:latest
- name: Build and push frps - name: Build and push frps
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
@ -79,5 +79,7 @@ jobs:
platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
${{ env.TAG_FRPS }} ${{ env.TAG_FRPS }}:${{ env.TAG_NAME }}
${{ env.TAG_FRPS_GPR }} ${{ env.TAG_FRPS }}:latest
${{ env.TAG_FRPS_GPR }}:${{ env.TAG_NAME }}
${{ env.TAG_FRPS_GPR }}:latest