diff --git a/frontend/Dockerfile.arm32v7 b/frontend/Dockerfile.arm32v7 index e9d33b5..861f90f 100644 --- a/frontend/Dockerfile.arm32v7 +++ b/frontend/Dockerfile.arm32v7 @@ -1,4 +1,4 @@ -FROM arm32v7/debian:buster +FROM multiarch/debian-debootstrap:armhf-buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm diff --git a/frontend/Dockerfile.arm64v8 b/frontend/Dockerfile.arm64v8 index b3195d9..c8deffd 100644 --- a/frontend/Dockerfile.arm64v8 +++ b/frontend/Dockerfile.arm64v8 @@ -1,4 +1,4 @@ -FROM arm64v8/debian:buster +FROM multiarch/debian-debootstrap:arm64-buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm64 diff --git a/proxy/Dockerfile.amd64 b/proxy/Dockerfile.amd64 index bc2c20a..c566c25 100644 --- a/proxy/Dockerfile.amd64 +++ b/proxy/Dockerfile.amd64 @@ -4,9 +4,11 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=amd64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ + && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ + && locale-gen \ && apt-get -qq purge -y golang \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists diff --git a/proxy/Dockerfile.arm32v7 b/proxy/Dockerfile.arm32v7 index 8db0194..e73881b 100644 --- a/proxy/Dockerfile.arm32v7 +++ b/proxy/Dockerfile.arm32v7 @@ -1,12 +1,14 @@ -FROM arm32v7/debian:buster +FROM multiarch/debian-debootstrap:armhf-buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ + && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ + && locale-gen \ && apt-get -qq purge -y golang \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists diff --git a/proxy/Dockerfile.arm64v8 b/proxy/Dockerfile.arm64v8 index d6707c3..8bed5e6 100644 --- a/proxy/Dockerfile.arm64v8 +++ b/proxy/Dockerfile.arm64v8 @@ -1,12 +1,14 @@ -FROM arm64v8/debian:buster +FROM multiarch/debian-debootstrap:arm64-buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ + && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ + && locale-gen \ && apt-get -qq purge -y golang \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists diff --git a/proxy/Dockerfile.i386 b/proxy/Dockerfile.i386 index 15d0e95..7496d3e 100644 --- a/proxy/Dockerfile.i386 +++ b/proxy/Dockerfile.i386 @@ -4,9 +4,11 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=386 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ + && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ + && locale-gen \ && apt-get -qq purge -y golang \ && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists