diff --git a/docker/trojan-go/Dockerfile b/docker/trojan-go/Dockerfile index 391947d..ef07239 100644 --- a/docker/trojan-go/Dockerfile +++ b/docker/trojan-go/Dockerfile @@ -1,10 +1,10 @@ # Dockerfile for trojan-go based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: # https://github.com/p4gefau1t/trojan-go -# https://github.com/v2ray/v2ray-core -# https://github.com/v2ray/geoip -# https://github.com/v2ray/domain-list-community +# https://github.com/v2fly/v2ray-core +# https://github.com/v2fly/geoip +# https://github.com/v2fly/domain-list-community FROM alpine:latest LABEL maintainer="Teddysun " @@ -16,8 +16,9 @@ RUN set -ex \ && chmod +x /root/trojan-go.sh \ && /root/trojan-go.sh \ && rm -fv /root/trojan-go.sh \ - && wget -O /usr/bin/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/bin/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && mkdir -p /usr/share/trojan-go \ + && wget -O /usr/share/trojan-go/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/trojan-go/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/trojan-go ENV TZ=Asia/Shanghai diff --git a/docker/trojan-go/Dockerfile.architecture b/docker/trojan-go/Dockerfile.architecture index 7d9f036..389fbf5 100644 --- a/docker/trojan-go/Dockerfile.architecture +++ b/docker/trojan-go/Dockerfile.architecture @@ -1,10 +1,10 @@ # Dockerfile for trojan-go based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: # https://github.com/p4gefau1t/trojan-go -# https://github.com/v2ray/v2ray-core -# https://github.com/v2ray/geoip -# https://github.com/v2ray/domain-list-community +# https://github.com/v2fly/v2ray-core +# https://github.com/v2fly/geoip +# https://github.com/v2fly/domain-list-community FROM --platform=${TARGETPLATFORM} alpine:latest LABEL maintainer="Teddysun " @@ -17,8 +17,9 @@ RUN set -ex \ && chmod +x /root/trojan-go.sh \ && /root/trojan-go.sh "${TARGETPLATFORM}" \ && rm -fv /root/trojan-go.sh \ - && wget -O /usr/bin/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/bin/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && mkdir -p /usr/share/trojan-go \ + && wget -O /usr/share/trojan-go/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/trojan-go/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/trojan-go ENV TZ=Asia/Shanghai diff --git a/docker/v2ray/Dockerfile b/docker/v2ray/Dockerfile index 9287ce1..93c835a 100644 --- a/docker/v2ray/Dockerfile +++ b/docker/v2ray/Dockerfile @@ -1,9 +1,9 @@ # Dockerfile for v2ray based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: -# https://github.com/v2ray/v2ray-core -# https://github.com/v2ray/geoip -# https://github.com/v2ray/domain-list-community +# https://github.com/v2fly/v2ray-core +# https://github.com/v2fly/geoip +# https://github.com/v2fly/domain-list-community FROM alpine:latest LABEL maintainer="Teddysun " @@ -13,12 +13,12 @@ COPY v2ray.sh /root/v2ray.sh COPY config.json /etc/v2ray/config.json RUN set -ex \ && apk add --no-cache tzdata ca-certificates \ - && mkdir -p /var/log/v2ray \ + && mkdir -p /var/log/v2ray /usr/share/v2ray \ && chmod +x /root/v2ray.sh \ && /root/v2ray.sh \ && rm -fv /root/v2ray.sh \ - && wget -O /usr/bin/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/bin/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && wget -O /usr/share/v2ray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/v2ray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/v2ray ENV TZ=Asia/Shanghai diff --git a/docker/v2ray/Dockerfile.architecture b/docker/v2ray/Dockerfile.architecture index fdf461a..3f28fe6 100644 --- a/docker/v2ray/Dockerfile.architecture +++ b/docker/v2ray/Dockerfile.architecture @@ -1,9 +1,9 @@ # Dockerfile for v2ray based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: -# https://github.com/v2ray/v2ray-core -# https://github.com/v2ray/geoip -# https://github.com/v2ray/domain-list-community +# https://github.com/v2fly/v2ray-core +# https://github.com/v2fly/geoip +# https://github.com/v2fly/domain-list-community FROM --platform=${TARGETPLATFORM} alpine:latest LABEL maintainer="Teddysun " @@ -14,12 +14,12 @@ COPY v2ray.sh /root/v2ray.sh COPY config.json /etc/v2ray/config.json RUN set -ex \ && apk add --no-cache tzdata ca-certificates \ - && mkdir -p /var/log/v2ray \ + && mkdir -p /var/log/v2ray /usr/share/v2ray \ && chmod +x /root/v2ray.sh \ && /root/v2ray.sh "${TARGETPLATFORM}" \ && rm -fv /root/v2ray.sh \ - && wget -O /usr/bin/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/bin/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && wget -O /usr/share/v2ray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/v2ray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/v2ray ENV TZ=Asia/Shanghai diff --git a/docker/xray/Dockerfile b/docker/xray/Dockerfile index eac48b2..9b1a216 100644 --- a/docker/xray/Dockerfile +++ b/docker/xray/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile for xray based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: # https://github.com/XTLS/Xray-core # https://github.com/v2fly/v2ray-core @@ -14,12 +14,12 @@ COPY xray.sh /root/xray.sh COPY config.json /etc/xray/config.json RUN set -ex \ && apk add --no-cache tzdata ca-certificates \ - && mkdir -p /var/log/xray /usr/local/share/xray \ + && mkdir -p /var/log/xray /usr/share/xray \ && chmod +x /root/xray.sh \ && /root/xray.sh \ && rm -fv /root/xray.sh \ - && wget -O /usr/local/share/xray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/local/share/xray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && wget -O /usr/share/xray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/xray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/xray ENV TZ=Asia/Shanghai diff --git a/docker/xray/Dockerfile.architecture b/docker/xray/Dockerfile.architecture index 9eb8080..da09ead 100644 --- a/docker/xray/Dockerfile.architecture +++ b/docker/xray/Dockerfile.architecture @@ -1,5 +1,5 @@ # Dockerfile for xray based alpine -# Copyright (C) 2019 - 2020 Teddysun +# Copyright (C) 2019 - 2021 Teddysun # Reference URL: # https://github.com/XTLS/Xray-core # https://github.com/v2fly/v2ray-core @@ -15,12 +15,12 @@ COPY xray.sh /root/xray.sh COPY config.json /etc/xray/config.json RUN set -ex \ && apk add --no-cache tzdata ca-certificates \ - && mkdir -p /var/log/xray /usr/local/share/xray \ + && mkdir -p /var/log/xray /usr/share/xray \ && chmod +x /root/xray.sh \ && /root/xray.sh "${TARGETPLATFORM}" \ && rm -fv /root/xray.sh \ - && wget -O /usr/local/share/xray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ - && wget -O /usr/local/share/xray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat + && wget -O /usr/share/xray/geosite.dat https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat \ + && wget -O /usr/share/xray/geoip.dat https://github.com/v2fly/geoip/releases/latest/download/geoip.dat VOLUME /etc/xray ENV TZ=Asia/Shanghai