diff --git a/.github/workflows/release_feat_v5.yml b/.github/workflows/release_feat_v5.yml index fccbfd90..9a488a4f 100644 --- a/.github/workflows/release_feat_v5.yml +++ b/.github/workflows/release_feat_v5.yml @@ -62,15 +62,13 @@ jobs: cache-dependency-path: gui/yarn.lock - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: Install Dependencies run: | sudo apt-get update -y && sudo apt-get install -y gzip - name: Build GUI run: | - # https://github.com/webpack/webpack/issues/14532#issuecomment-947012063 - export NODE_OPTIONS=--openssl-legacy-provider yarn --cwd gui --check-files yarn --cwd gui build - name: Build v2rayA Binaries @@ -131,7 +129,7 @@ jobs: - name: Install Package Dependencies if: startsWith(github.ref, 'refs/tags/v') run: | - gem install fpm -v 1.13.1 + gem install fpm -v 1.15.1 sudo apt-get install -y libarchive-tools rpm lintian reprepro gnupg gnupg2 expect tar nsis unzip - name: Package if: startsWith(github.ref, 'refs/tags/v') diff --git a/Dockerfile b/Dockerfile index 5a265d8a..252b5f49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /build/gui RUN echo "network-timeout 600000" >> .yarnrc #RUN yarn config set registry https://registry.npm.taobao.org #RUN yarn config set sass_binary_site https://cdn.npm.taobao.org/dist/node-sass -g -RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn cache clean && yarn && yarn build +RUN yarn cache clean && yarn && yarn build FROM golang:alpine AS builder ADD service /build/service diff --git a/Dockerfile.gui b/Dockerfile.gui index 705ad82c..1a493969 100644 --- a/Dockerfile.gui +++ b/Dockerfile.gui @@ -1,7 +1,7 @@ FROM node:lts-alpine AS builder ADD gui /gui WORKDIR /gui -RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn && yarn build +RUN yarn && yarn build FROM nginx:stable-alpine COPY --from=builder /web /usr/share/nginx/html diff --git a/Dockerfile.nightly b/Dockerfile.nightly index b6f6303a..c23023b9 100644 --- a/Dockerfile.nightly +++ b/Dockerfile.nightly @@ -13,7 +13,7 @@ WORKDIR /build/gui RUN echo "network-timeout 600000" >> .yarnrc #RUN yarn config set registry https://registry.npmmirror.com #RUN yarn config set sass_binary_site https://cdn.npm.taobao.org/dist/node-sass -g -RUN export NODE_OPTIONS=--openssl-legacy-provider && yarn cache clean && yarn && yarn build +RUN yarn cache clean && yarn && yarn build FROM golang:alpine AS builder ADD service /build/service diff --git a/build-in-pwsh.ps1 b/build-in-pwsh.ps1 index f6d360a4..da69d3ad 100644 --- a/build-in-pwsh.ps1 +++ b/build-in-pwsh.ps1 @@ -69,8 +69,6 @@ Function Build-v2rayA(){ ${env:CGO_ENABLED} = "0" #Set yarn's output path ${env:OUTPUT_DIR} = "$CurrentPath/service/server/router/web" - #Fix node build error: https://github.com/webpack/webpack/issues/14532#issuecomment-947012063 - ${env:NODE_OPTIONS} = "--openssl-legacy-provider" #Build Web Panel Set-Location -Path "$CurrentPath/gui" yarn; yarn build diff --git a/gui/src/components/modalServer.vue b/gui/src/components/modalServer.vue index e845ee5d..27c2ebdf 100644 --- a/gui/src/components/modalServer.vue +++ b/gui/src/components/modalServer.vue @@ -59,6 +59,12 @@ expanded /> + + + + + + + + +