Revert 'Replace gotunnel with bore'

wizawu · May 11, 2023 · 6848d5c · 6848d5c
1 parent c570bb0
commit 6848d5c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
@@ -1,4 +1,9 @@
+FROM golang:1.16-buster as gotunnel
+RUN apt install -y git
+RUN go get github.com/xjdrew/gotunnel
+
 FROM node:14.16-buster-slim
+COPY --from=gotunnel /go/bin/gotunnel /usr/bin/gotunnel
 
 RUN echo "deb http://hk.archive.ubuntu.com/ubuntu focal main universe" > /etc/apt/sources.list
 RUN apt update -o Acquire::AllowInsecureRepositories=true -y && \
@@ -11,12 +16,8 @@ RUN apt update -o Acquire::AllowInsecureRepositories=true -y && \
     && \
     apt clean
 
-RUN wget --no-check-certificate -q -O - \
-    https://github.com/ekzhang/bore/releases/download/v0.5.0/bore-v0.5.0-x86_64-unknown-linux-musl.tar.gz | \
-    tar -C /usr/bin/ -zxf -
-
 RUN wget --no-check-certificate -q -O /usr/bin/brook \
     https://github.com/txthinking/brook/releases/download/v20200502/brook_linux_amd64
 
-RUN chmod a+x /usr/bin/bore /usr/bin/brook
+RUN chmod a+x /usr/bin/brook /usr/bin/gotunnel
 RUN ln -f /usr/share/zoneinfo/PRC /etc/localtime