diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8015da02..96ded963 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,23 +49,23 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} # Docker Hub用户名 password: ${{ secrets.DOCKERHUB_PASSWORD }} # Docker Hub密码 - # 登录到GitHub Package Registry - - name: Login to the GPR - uses: docker/login-action@v3 - with: - registry: ghcr.io # GPR的地址 - username: ${{ github.repository_owner }} # GitHub仓库所有者 - password: ${{ secrets.GPR_TOKEN }} # GPR的访问令牌 + # # 登录到GitHub Package Registry + # - name: Login to the GPR + # uses: docker/login-action@v3 + # with: + # registry: ghcr.io # GPR的地址 + # username: ${{ github.repository_owner }} # GitHub仓库所有者 + # password: ${{ secrets.GPR_TOKEN }} # GPR的访问令牌 # 准备镜像标签 - name: Prepare Image Tags run: | echo "DOCKERFILE_FRPC_PATH=dockerfiles/Dockerfile-for-frpc" >> $GITHUB_ENV # 设置frpc的Dockerfile路径 echo "DOCKERFILE_FRPS_PATH=dockerfiles/Dockerfile-for-frps" >> $GITHUB_ENV # 设置frps的Dockerfile路径 - echo "TAG_FRPC=fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置frpc的镜像标签 - echo "TAG_FRPS=fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置frps的镜像标签 - echo "TAG_FRPC_GPR=ghcr.io/fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置GPR上frpc的镜像标签 - echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置GPR上frps的镜像标签 + echo "TAG_FRPC=918178/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置frpc的镜像标签 + echo "TAG_FRPS=918178/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置frps的镜像标签 + # echo "TAG_FRPC_GPR=ghcr.io/fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置GPR上frpc的镜像标签 + # echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV # 设置GPR上frps的镜像标签 # 构建并推送frpc镜像 - name: Build and push frpc