Skip to content

Commit 76bfcbb

Browse files
committed
chore: update
1 parent 6726871 commit 76bfcbb

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
heroku_app_name: ${{secrets.APP_NAME}} #Must be unique in Heroku
2222
heroku_email: ${{secrets.EMAIL}}
2323
usedocker: true
24-
docker_build_args: |
25-
HD_UUID
24+
# docker_build_args: |
25+
# HD_UUID
2626
env:
2727
# 这是为了heroku,注意前缀有个HD,这是为了告诉heroku-deploy,这些变量需要传入到container 中。
2828
HD_UUID: ${{ secrets.HEROKU_V2RAY_UUID }} # UUID for v2ray user, 为了安全,一定要放入github action token中

Dockerfile

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
FROM v2fly/v2fly-core:latest
22

3-
# ADD configure.sh /configure.sh
3+
ADD configure.sh /configure.sh
44

5-
# RUN apk add --no-cache ca-certificates curl unzip \
6-
# && chmod +x /configure.sh
5+
CMD /configure.sh
76

8-
# CMD /configure.sh
9-
10-
ADD v2rayconf.sh /v2rayconf.sh
11-
12-
ARG UUID
13-
ENV UUID=$UUID
14-
15-
RUN touch /etc/v2ray/config.json
16-
RUN /v2rayconf.sh
177

configure.sh

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
1-
#!/bin/sh
2-
3-
# Download and install V2Ray
4-
mkdir /tmp/v2ray
5-
curl -L -H "Cache-Control: no-cache" -o /tmp/v2ray/v2ray.zip https://github.com/v2fly/v2ray-core/releases/latest/download/v2ray-linux-64.zip
6-
unzip /tmp/v2ray/v2ray.zip -d /tmp/v2ray
7-
install -m 755 /tmp/v2ray/v2ray /usr/local/bin/v2ray
8-
install -m 755 /tmp/v2ray/v2ctl /usr/local/bin/v2ctl
9-
10-
# Remove temporary directory
11-
rm -rf /tmp/v2ray
12-
13-
# V2Ray new configuration
14-
install -d /usr/local/etc/v2ray
15-
cat << EOF > /usr/local/etc/v2ray/config.json
1+
cat << EOF > /etc/v2ray/config.json
162
{
173
"inbounds": [
184
{
@@ -41,4 +27,4 @@ cat << EOF > /usr/local/etc/v2ray/config.json
4127
EOF
4228

4329
# Run V2Ray
44-
/usr/local/bin/v2ray -config /usr/local/etc/v2ray/config.json
30+
/usr/bin/v2ray -config /etc/v2ray/config.json

0 commit comments

Comments
 (0)