From f29723488edbbfe04745d3b326642a21cbe1bad4 Mon Sep 17 00:00:00 2001 From: Markson Hon Date: Sun, 24 Nov 2024 18:42:04 +0800 Subject: [PATCH] ci(docker): add linux/risv64 for v2raya-gui --- .github/workflows/release_main.yml | 6 +----- install/docker/Dockerfile.GUI.Action | 8 +++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index c0a800a859..c35160f786 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -556,7 +556,6 @@ jobs: Build_APT_Repository_and_AUR: runs-on: ubuntu-22.04 needs: [Build_v2rayA_Binaries, Build_Linux_Packages, Build_v2ray_Debian_Packages] - steps: - uses: actions/checkout@v4 with: @@ -694,7 +693,6 @@ jobs: Release_v2rayA_to_Docker: runs-on: ubuntu-22.04 needs: [GitHub_Release] - steps: - uses: actions/checkout@v4 with: @@ -746,7 +744,6 @@ jobs: Release_v2rayA_GUI_to_Docker: runs-on: ubuntu-22.04 needs: [Build_v2rayA_Web] - steps: - uses: actions/checkout@v4 with: @@ -789,7 +786,7 @@ jobs: context: . builder: ${{ steps.buildx.outputs.name }} file: install/docker/Dockerfile.GUI.Action - platforms: linux/arm,linux/arm64,linux/amd64 + platforms: linux/arm,linux/arm64,linux/amd64,linux/riscv64 push: true tags: | mzz2017/v2raya-gui:latest @@ -799,7 +796,6 @@ jobs: Submit_to_Microsoft_winget: runs-on: windows-latest needs: [GitHub_Release] - steps: - uses: actions/checkout@v4 with: diff --git a/install/docker/Dockerfile.GUI.Action b/install/docker/Dockerfile.GUI.Action index e2729ecf62..483c601d6f 100644 --- a/install/docker/Dockerfile.GUI.Action +++ b/install/docker/Dockerfile.GUI.Action @@ -1,4 +1,6 @@ -FROM nginx:stable-alpine -WORKDIR /build -COPY ./web /usr/share/nginx/html +FROM alpine:latest +WORKDIR / +RUN apk add --no-cache tzdata apache2 +COPY ./web /usr/share/v2raya-gui +ENTRYPOINT ["/usr/sbin/httpd", "-d", "/usr/share/v2raya-gui"] EXPOSE 80 \ No newline at end of file