Skip to content

Commit

Permalink
Chore: embed tzdata for weirdos and newbies (#2890)
Browse files Browse the repository at this point in the history
  • Loading branch information
fakeboboliu authored Aug 29, 2023
1 parent 5ec4d99 commit 1855e18
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM --platform=${BUILDPLATFORM} golang:alpine as builder

RUN apk add --no-cache make git ca-certificates tzdata && \
RUN apk add --no-cache make git ca-certificates && \
wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
WORKDIR /workdir
COPY --from=tonistiigi/xx:golang / /
Expand All @@ -15,7 +15,6 @@ RUN --mount=target=. \
FROM alpine:latest
LABEL org.opencontainers.image.source="https://github.com/Dreamacro/clash"

COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /Country.mmdb /root/.config/clash/
COPY --from=builder /clash /
Expand Down
1 change: 1 addition & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"path/filepath"
"runtime"
"syscall"
_ "time/tzdata"

"github.com/Dreamacro/clash/config"
C "github.com/Dreamacro/clash/constant"
Expand Down

0 comments on commit 1855e18

Please sign in to comment.