From daca4b77359da2d77f19be20fb88836c1709b572 Mon Sep 17 00:00:00 2001 From: yusing Date: Mon, 23 Sep 2024 05:34:50 +0800 Subject: [PATCH] shrink docker image size in half, adding back ForceColor for logrus --- Dockerfile | 8 +++++--- src/main.go | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 626785e..c2a94ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM golang:1.23.1-alpine AS builder +RUN apk add --no-cache tzdata COPY src /src ENV GOCACHE=/root/.cache/go-build WORKDIR /src @@ -7,16 +8,17 @@ RUN --mount=type=cache,target="/go/pkg/mod" \ go mod download && \ CGO_ENABLED=0 GOOS=linux go build -pgo=auto -o go-proxy github.com/yusing/go-proxy -FROM alpine:3.20 +FROM scratch LABEL maintainer="yusing@6uo.me" -RUN apk add --no-cache tzdata +# copy timezone data +COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo + # copy binary COPY --from=builder /src/go-proxy /app/ COPY schema/ /app/schema -RUN chmod +x /app/go-proxy ENV DOCKER_HOST=unix:///var/run/docker.sock ENV GOPROXY_DEBUG=0 diff --git a/src/main.go b/src/main.go index 5384d49..cdf122c 100755 --- a/src/main.go +++ b/src/main.go @@ -44,6 +44,7 @@ func main() { DisableSorting: true, DisableLevelTruncation: true, FullTimestamp: true, + ForceColors: true, TimestampFormat: "01-02 15:04:05", }) }