From b5a459b94d2a4fc9bd9ea68f783b55eb91b9934a Mon Sep 17 00:00:00 2001 From: Dnomd343 Date: Tue, 4 Oct 2022 17:25:16 +0800 Subject: [PATCH] build: update docker image --- Dockerfile | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47f6678..fe357fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG ALPINE_IMG="alpine:3.16" -ARG GOLANG_IMG="golang:1.19-alpine3.16" +ARG ALPINE="alpine:3.16" +ARG GOLANG="golang:1.19-alpine3.16" -FROM ${ALPINE_IMG} AS upx +FROM ${ALPINE} AS upx ENV UPX_VER="3.96" RUN sed -i 's/v3.\d\d/v3.15/' /etc/apk/repositories && apk add bash build-base perl ucl-dev zlib-dev RUN wget https://github.com/upx/upx/releases/download/v${UPX_VER}/upx-${UPX_VER}-src.tar.xz && tar xf upx-${UPX_VER}-src.tar.xz @@ -9,36 +9,36 @@ WORKDIR ./upx-${UPX_VER}-src/ RUN make -C ./src/ && mkdir -p /upx/bin/ && mv ./src/upx.out /upx/bin/upx && \ mkdir -p /upx/lib/ && cd /usr/lib/ && cp -d ./libgcc_s.so* ./libstdc++.so* ./libucl.so* /upx/lib/ -FROM ${GOLANG_IMG} AS xray -ENV XRAY_VER="1.6.0" -RUN wget https://github.com/XTLS/Xray-core/archive/refs/tags/v${XRAY_VER}.tar.gz && tar xf v${XRAY_VER}.tar.gz -WORKDIR ./Xray-core-${XRAY_VER}/main/ +FROM ${GOLANG} AS xray +ENV XRAY="1.6.0" +RUN wget https://github.com/XTLS/Xray-core/archive/refs/tags/v${XRAY}.tar.gz && tar xf v${XRAY}.tar.gz +WORKDIR ./Xray-core-${XRAY}/main/ RUN go get -d -RUN env CGO_ENABLED=0 go build -v -o xray -trimpath -ldflags "-s -w" && mv xray /tmp/ +RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-s -w" && mv main /tmp/xray -FROM ${GOLANG_IMG} AS v2ray -ENV V2FLY_VER="5.1.0" -RUN wget https://github.com/v2fly/v2ray-core/archive/refs/tags/v${V2FLY_VER}.tar.gz && tar xf v${V2FLY_VER}.tar.gz -WORKDIR ./v2ray-core-${V2FLY_VER}/main/ +FROM ${GOLANG} AS v2ray +ENV V2FLY="5.1.0" +RUN wget https://github.com/v2fly/v2ray-core/archive/refs/tags/v${V2FLY}.tar.gz && tar xf v${V2FLY}.tar.gz +WORKDIR ./v2ray-core-${V2FLY}/main/ RUN go get -d -RUN env CGO_ENABLED=0 go build -v -o v2ray -trimpath -ldflags "-s -w" && mv v2ray /tmp/ +RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-s -w" && mv main /tmp/v2ray -FROM ${GOLANG_IMG} AS sagray -#ENV SAGER_VER="5.0.16" -#RUN wget https://github.com/SagerNet/v2ray-core/archive/refs/tags/v${SAGER_VER}.tar.gz && tar xf v${SAGER_VER}.tar.gz -#WORKDIR ./v2ray-core-${SAGER_VER}/main/ +FROM ${GOLANG} AS sagray +#ENV SAGER_VER="5.0.17" RUN wget https://github.com/SagerNet/v2ray-core/archive/refs/heads/main.zip && unzip main.zip WORKDIR ./v2ray-core-main/main/ +#RUN wget https://github.com/SagerNet/v2ray-core/archive/refs/tags/v${SAGER}.tar.gz && tar xf v${SAGER}.tar.gz +#WORKDIR ./v2ray-core-${SAGER}/main/ RUN go get -d -RUN env CGO_ENABLED=0 go build -v -o sagray -trimpath -ldflags "-s -w" && mv sagray /tmp/ +RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-s -w" && mv main /tmp/sagray -FROM ${GOLANG_IMG} AS xproxy +FROM ${GOLANG} AS xproxy COPY ./ /XProxy/ WORKDIR /XProxy/cmd/ RUN go get -d -RUN env CGO_ENABLED=0 go build -v -o xproxy -trimpath -ldflags "-s -w" && mv xproxy /tmp/ +RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-s -w" && mv cmd /tmp/xproxy -FROM ${ALPINE_IMG} AS asset +FROM ${ALPINE} AS build WORKDIR /tmp/ RUN wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat" && \ wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat" @@ -50,10 +50,10 @@ COPY --from=xray /tmp/xray /asset/usr/bin/ COPY --from=upx /upx/ /usr/ RUN ls /asset/usr/bin/* | xargs -P0 -n1 upx -9 -FROM ${ALPINE_IMG} +FROM ${ALPINE} RUN apk add --no-cache dhcp iptables ip6tables radvd && \ mkdir -p /run/radvd/ && rm -f /etc/dhcp/dhcpd.conf.example && \ touch /var/lib/dhcp/dhcpd.leases && touch /var/lib/dhcp/dhcpd6.leases -COPY --from=asset /asset/ / +COPY --from=build /asset/ / WORKDIR /xproxy/ ENTRYPOINT ["xproxy"]