From 72f7d02948c49b94fa55b840c208ce3bfcc31e00 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Thu, 9 Apr 2020 23:31:25 +0800 Subject: [PATCH] Docker image switch to debian --- frontend/Dockerfile | 7 ++++--- proxy/Dockerfile | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 71dda25..b116a78 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,13 +1,14 @@ ARG THIS_ARCH_ALT=amd64 -FROM multiarch/alpine:${THIS_ARCH_ALT}-edge +FROM ${THIS_ARCH}/debian:buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=${THIS_ARCH_GO} WORKDIR /root COPY . . -RUN apk -q --no-cache add go build-base \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang \ && cd /root && go build -o /frontend \ && cd / && rm -rf /root/* \ - && apk del --purge go build-base + && apt-get -qq purge -y golang \ + && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/frontend"] diff --git a/proxy/Dockerfile b/proxy/Dockerfile index dcf07e5..7431961 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -1,13 +1,14 @@ ARG THIS_ARCH_ALT=amd64 -FROM multiarch/alpine:${THIS_ARCH_ALT}-edge +FROM ${THIS_ARCH}/debian:buster LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=${THIS_ARCH_GO} WORKDIR /root COPY . . -RUN apk -q --no-cache add go build-base \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ - && apk del --purge go build-base + && apt-get -qq purge -y golang \ + && apt-get -qq autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists ENTRYPOINT ["/proxy"]