From f08b38929b6bf6ae41b056c6eb6470bfa225d6e8 Mon Sep 17 00:00:00 2001 From: wulabing Date: Mon, 17 Apr 2023 20:52:24 +0800 Subject: [PATCH] 0.0.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [fix] 修复二维码相关异常 [update] 完善使用文档 --- reality/Dockerfile | 4 ++-- reality/README.MD | 1 + reality/entrypoint.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/reality/Dockerfile b/reality/Dockerfile index 204a709..fc18d02 100644 --- a/reality/Dockerfile +++ b/reality/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="wulabing " #ENV GOPROXY=https://goproxy.cn,direct WORKDIR /app -RUN apk add --no-cache git libqrencode && git clone https://github.com/XTLS/Xray-core.git . && \ +RUN apk add --no-cache git && git clone https://github.com/XTLS/Xray-core.git . && \ go mod download && \ go build -o xray /app/main/ @@ -29,7 +29,7 @@ COPY ./config.json / COPY --from=builder /app/xray / -RUN apk add --no-cache tzdata ca-certificates jq curl && \ +RUN apk add --no-cache tzdata ca-certificates jq curl libqrencode && \ mkdir -p /var/log/xray &&\ wget -O /geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat && \ wget -O /geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat && \ diff --git a/reality/README.MD b/reality/README.MD index 2581d7c..3c21747 100644 --- a/reality/README.MD +++ b/reality/README.MD @@ -14,6 +14,7 @@ curl -fsSL get.docker.com -o get-docker.sh && sh get-docker.sh EXTERNAL_PORT 为你想要使用的端口，如下所示，你将使用443端口 ``` +docker pull wulabing/xray_docker_reality:latest EXTERNAL_PORT=443 docker run -d --name xray_reality --restart=always -p $EXTERNAL_PORT:443 -e EXTERNAL_PORT=$EXTERNAL_PORT wulabing/xray_docker_reality:latest ``` diff --git a/reality/entrypoint.sh b/reality/entrypoint.sh index 12b1f02..584a61a 100644 --- a/reality/entrypoint.sh +++ b/reality/entrypoint.sh @@ -63,12 +63,12 @@ else if [ "$IPV4" != "null" ]; then SUB_IPV4="vless://$UUID@$IPV4:$EXTERNAL_PORT?encryption=none&security=reality&type=$NETWORK&sni=$FIRST_SERVERNAME&fp=chrome&pbk=$PUBLICKEY&flow=xtls-rprx-vision#wulabing_docker_vless_reality_vision" echo "IPV4 订阅连接: $SUB_IPV4" >>/config_info.txt - echo "IPV4 订阅二维码: echo $SUB_IPV4 | qrencode -o - -t UTF8" >>/config_info.txt + echo -e "IPV4 订阅二维码:\n $(echo "$SUB_IPV4" | qrencode -o - -t UTF8)" >>/config_info.txt fi if [ "$IPV6" != "null" ];then SUB_IPV6="vless://$UUID@$IPV6:$EXTERNAL_PORT?encryption=none&security=reality&type=$NETWORK&sni=$FIRST_SERVERNAME&fp=chrome&pbk=$PUBLICKEY&flow=xtls-rprx-vision#wulabing_docker_vless_reality_vision" echo "IPV6 订阅连接: $SUB_IPV6" >>/config_info.txt - echo "IPV6 订阅二维码: echo $SUB_IPV6 | qrencode -o - -t UTF8" >>/config_info.txt + echo -e "IPV6 订阅二维码:\n $(echo "$SUB_IPV6" | qrencode -o - -t UTF8)" >>/config_info.txt fi