diff --git a/Dockerfile b/Dockerfile index 2ca2166..3ea449d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,23 +2,12 @@ ARG ALPINE="alpine:3.17" ARG RUST="rust:1.67-alpine3.17" ARG GOLANG="golang:1.19-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 dnsproxy ENV DNSPROXY="0.48.0" RUN wget https://github.com/AdguardTeam/dnsproxy/archive/refs/tags/v${DNSPROXY}.tar.gz && tar xf v${DNSPROXY}.tar.gz WORKDIR ./dnsproxy-${DNSPROXY}/ RUN go get RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-X main.VersionString=${DNSPROXY} -s -w" && mv dnsproxy /tmp/ -COPY --from=upx /tmp/upx /usr/bin/ -RUN upx -9 /tmp/dnsproxy FROM ${GOLANG} AS overture ENV OVERTURE="1.8" @@ -26,8 +15,6 @@ RUN wget https://github.com/shawn1m/overture/archive/refs/tags/v${OVERTURE}.tar. WORKDIR ./overture-${OVERTURE}/main/ RUN go get RUN env CGO_ENABLED=0 go build -v -trimpath -ldflags "-X main.version=v${OVERTURE} -s -w" && mv main /tmp/overture -COPY --from=upx /tmp/upx /usr/bin/ -RUN upx -9 /tmp/overture FROM ${ALPINE} AS adguard-src RUN apk add git @@ -50,8 +37,6 @@ WORKDIR /AdGuardHome/ RUN go get COPY --from=adguard-web /tmp/static/ ./build/static/ RUN make CHANNEL="release" VERBOSE=1 go-build && mv AdGuardHome /tmp/ -COPY --from=upx /tmp/upx /usr/bin/ -RUN upx -9 /tmp/AdGuardHome FROM ${RUST} AS rust-mods RUN apk add libc-dev openssl-dev @@ -66,12 +51,10 @@ COPY ./ /cleardns/ COPY --from=rust-mods /tmp/libassets.a /cleardns/src/target/release/ COPY --from=rust-mods /tmp/libto_json.a /cleardns/src/target/release/ WORKDIR /cleardns/bin/ -RUN cmake -DCMAKE_EXE_LINKER_FLAGS=-static .. && make && mv cleardns /tmp/ -COPY --from=upx /tmp/upx /usr/bin/ -RUN strip /tmp/cleardns && upx -9 /tmp/cleardns +RUN cmake -DCMAKE_EXE_LINKER_FLAGS=-static .. && make && strip cleardns && mv cleardns /tmp/ FROM ${ALPINE} AS build -RUN apk add xz +RUN apk add upx xz WORKDIR /release/ RUN wget https://res.dnomd343.top/Share/cleardns/gfwlist.txt.xz && \ wget https://res.dnomd343.top/Share/cleardns/china-ip.txt.xz && \ @@ -81,6 +64,8 @@ COPY --from=cleardns /tmp/cleardns /release/usr/bin/ COPY --from=dnsproxy /tmp/dnsproxy /release/usr/bin/ COPY --from=overture /tmp/overture /release/usr/bin/ COPY --from=adguard /tmp/AdGuardHome /release/usr/bin/ +WORKDIR /release/usr/bin/ +RUN ls | xargs -n1 -P0 upx -9 FROM ${ALPINE} COPY --from=build /release/ /