From 78e3070e37d1a042725af9fdb17e1a5b2048fda5 Mon Sep 17 00:00:00 2001
From: Dnomd343 <i@343.re>
Date: Fri, 10 Mar 2023 18:49:04 +0800
Subject: [PATCH] build: Alpine already supports multi-architecture upx

---
 Dockerfile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09bc62a..38d108d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,12 @@
 ARG ALPINE="alpine:3.17"
 ARG GOLANG="golang:1.20-alpine3.17"
 
-FROM ${ALPINE} AS upx
-RUN apk add build-base cmake
-ENV UPX="4.0.2"
-RUN wget https://github.com/upx/upx/releases/download/v${UPX}/upx-${UPX}-src.tar.xz && tar xf upx-${UPX}-src.tar.xz
-WORKDIR ./upx-${UPX}-src/
-RUN make UPX_CMAKE_CONFIG_FLAGS=-DCMAKE_EXE_LINKER_FLAGS=-static
-WORKDIR ./build/release/
-RUN strip upx && mv upx /tmp/
-
 FROM ${GOLANG} AS xray
 ENV XRAY="1.8.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
 RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-s -w" && mv main /tmp/xray
-COPY --from=upx /tmp/upx /usr/bin/
-RUN upx -9 /tmp/xray
 
 FROM ${GOLANG} AS xproxy
 RUN apk add git
@@ -25,17 +14,17 @@ COPY ./ /XProxy/
 WORKDIR /XProxy/cmd/
 RUN go get
 RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-X main.version=$(git describe --tag) -s -w" && mv cmd /tmp/xproxy
-COPY --from=upx /tmp/upx /usr/bin/
-RUN upx -9 /tmp/xproxy
 
 FROM ${ALPINE} AS build
-RUN apk add xz
+RUN apk add upx xz
 WORKDIR /release/
 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" && \
     tar cJf assets.tar.xz *.dat && rm *.dat
 COPY --from=xproxy /tmp/xproxy /release/usr/bin/
 COPY --from=xray /tmp/xray /release/usr/bin/
+WORKDIR /release/usr/bin/
+RUN ls | xargs -n1 -P0 upx -9
 
 FROM ${ALPINE}
 RUN apk add --no-cache dhcp iptables ip6tables radvd && \