Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

对接GoV2Panel面板 #473

Closed
wants to merge 55 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
bf77d64
up
pingProMax Sep 20, 2023
3a6de51
up
pingProMax Sep 21, 2023
c142e01
Merge branch 'XrayR-project:master' into master
pingProMax Sep 26, 2023
220834b
Merge branch 'XrayR-project:master' into master
pingProMax Oct 5, 2023
4c01eb9
up
pingProMax Oct 7, 2023
b3cac80
Merge branch 'master' of https://github.com/pingProMax/XrayR
pingProMax Oct 7, 2023
916980f
up
pingProMax Oct 7, 2023
c054e5d
up
pingProMax Oct 7, 2023
6416b47
up
pingProMax Oct 7, 2023
b36f828
up
pingProMax Oct 7, 2023
f58c5ad
Update codeql-analysis.yml
Septrum101 Oct 8, 2023
b2966c1
Update docker.yml
Septrum101 Oct 8, 2023
181db1d
Merge branch 'master' into master
Septrum101 Oct 8, 2023
7b5cfbf
Update docker.yml
Septrum101 Oct 8, 2023
30b798b
Update docker.yml
Septrum101 Oct 8, 2023
15d0f88
Update docker.yml
Septrum101 Oct 8, 2023
a5ef88d
Update docker.yml
Septrum101 Oct 8, 2023
81d9c2a
up
pingProMax Oct 7, 2023
366b1c4
Merge branch 'master' of https://github.com/pingProMax/XrayR
pingProMax Oct 8, 2023
b2d6984
Update docker.yml
Septrum101 Oct 8, 2023
bda3f71
Update docker.yml
Septrum101 Oct 8, 2023
d784912
Update docker.yml
Septrum101 Oct 8, 2023
b26a4d9
Merge branch 'XrayR-project:master' into master
pingProMax Oct 8, 2023
d0b6c21
up
pingProMax Oct 7, 2023
25ff64f
up
pingProMax Sep 20, 2023
8d367d8
build(deps): bump github.com/spf13/viper from 1.16.0 to 1.17.0 (#469)
dependabot[bot] Oct 7, 2023
50a771b
Update Mergo package and Go version
Septrum101 Oct 8, 2023
6ae319e
Update codeql-analysis.yml
Septrum101 Oct 8, 2023
390db97
Update docker.yml
Septrum101 Oct 8, 2023
a933dc6
Update docker.yml
Septrum101 Oct 8, 2023
31903cf
Update docker.yml
Septrum101 Oct 8, 2023
76b38d3
Update docker.yml
Septrum101 Oct 8, 2023
282bcdd
Update docker.yml
Septrum101 Oct 8, 2023
ed4a9f0
Update docker.yml
Septrum101 Oct 8, 2023
a8913df
Update docker.yml
Septrum101 Oct 8, 2023
5e89e54
Update docker.yml
Septrum101 Oct 8, 2023
376f862
Merge branch 'master' of https://github.com/pingProMax/XrayR
pingProMax Oct 8, 2023
35f1d76
Update docker.yml
Septrum101 Oct 8, 2023
758ef26
Merge branch 'XrayR-project:master' into master
pingProMax Oct 8, 2023
0a1d75f
up
pingProMax Oct 7, 2023
273c5c0
up
pingProMax Oct 7, 2023
34a2d5e
up
pingProMax Oct 7, 2023
8750c9e
build(deps): bump github.com/spf13/viper from 1.16.0 to 1.17.0 (#469)
dependabot[bot] Oct 7, 2023
94057b8
Update Mergo package and Go version
Septrum101 Oct 8, 2023
6bab545
Update codeql-analysis.yml
Septrum101 Oct 8, 2023
92f86dc
Update docker.yml
Septrum101 Oct 8, 2023
476a244
Update docker.yml
Septrum101 Oct 8, 2023
f5a27fe
Update docker.yml
Septrum101 Oct 8, 2023
9ad8f8c
Update docker.yml
Septrum101 Oct 8, 2023
d12d68f
Update docker.yml
Septrum101 Oct 8, 2023
616e685
Update docker.yml
Septrum101 Oct 8, 2023
26e69ab
Update docker.yml
Septrum101 Oct 8, 2023
1c0d52c
Update docker.yml
Septrum101 Oct 8, 2023
292429c
Update docker.yml
Septrum101 Oct 8, 2023
d0dfc9d
Merge branch 'master' of https://github.com/pingProMax/XrayR
pingProMax Oct 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ jobs:
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main


- name: Install Go
uses: actions/setup-go@v4
with:
go-version-file: go.mod
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
Expand Down
93 changes: 77 additions & 16 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,92 @@ on:
pull_request:
branches:
- 'master'
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm/v6
- linux/arm/v7
- linux/arm64
steps:
- name: Check out the repo
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
images: ghcr.io/${{ github.repository }}
- name: Build and push
uses: docker/build-push-action@v3
driver-opts: image=moby/buildkit:latest
- name: Build and push by digest
id: build
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/arm/v7,linux/arm64,linux/amd64,linux/s390x
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
- name: Export digest
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest
uses: actions/upload-artifact@v3
with:
name: digests
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1

merge:
runs-on: ubuntu-latest
needs:
- build
steps:
- name: Download digests
uses: actions/download-artifact@v3
with:
name: digests
path: /tmp/digests
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
$(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ A Xray backend framework that can easily support many panels.
| [PMPanel](https://github.com/ByteInternetHK/PMPanel) | √ | √ | √ |
| [ProxyPanel](https://github.com/ProxyPanel/ProxyPanel) | √ | √ | √ |
| [WHMCS (V2RaySocks)](https://v2raysocks.doxtex.com/) | √ | √ | √ |
| [GoV2Panel](https://github.com/pingProMax/gov2panel) | √ | √ | √ |

## 软件安装

Expand Down Expand Up @@ -104,4 +105,3 @@ wget -N https://raw.githubusercontent.com/XrayR-project/XrayR-release/master/ins

[![Stargazers over time](https://starchart.cc/XrayR-project/XrayR.svg)](https://starchart.cc/XrayR-project/XrayR)


Loading