OrgGo
/
clash
mirror of https://github.com/Dreamacro/clash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: docker multiplatform build

This commit is contained in:
Dreamacro 2020-06-21 12:38:14 +08:00
parent 18bb285a90
commit 5f3db72422
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -3,10 +3,11 @@ FROM golang:alpine as builder
RUN apk add --no-cache make git && \ RUN apk add --no-cache make git && \
wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
WORKDIR /clash-src WORKDIR /clash-src
COPY --from=tonistiigi/xx:golang / /
COPY . /clash-src COPY . /clash-src
RUN go mod download && \ RUN go mod download && \
make linux-amd64 && \ make docker && \
mv ./bin/clash-linux-amd64 /clash mv ./bin/clash-docker /clash
FROM alpine:latest FROM alpine:latest

3
Makefile
View File

@ -29,6 +29,9 @@ WINDOWS_ARCH_LIST = \
all: linux-amd64 darwin-amd64 windows-amd64 # Most used all: linux-amd64 darwin-amd64 windows-amd64 # Most used
docker:
$(GOBUILD) -o $(BINDIR)/$(NAME)-$@
darwin-amd64: darwin-amd64:
GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@ GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@