From d8b4f160ac7aeaf5d1fa5016cccb549a22e6458c Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Mon, 10 Jun 2024 01:58:38 -0700 Subject: [PATCH] use golang builder --- Dockerfile | 10 +++++++++- Makefile | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f392ece..de7152d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,14 @@ +FROM golang as builder +WORKDIR /src +RUN git clone https://github.com/tenox7/wrp.git +WORKDIR /src/wrp +RUN go mod download +ARG TARGETARCH +RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -o /wrp-${TARGETARCH} + FROM chromedp/headless-shell ARG TARGETARCH -ADD wrp-${TARGETARCH}-linux /wrp +COPY --from=builder /wrp-${TARGETARCH} /wrp ENTRYPOINT ["/wrp"] ENV PATH="/headless-shell:${PATH}" LABEL maintainer="as@tenoware.com" diff --git a/Makefile b/Makefile index da0537d..ee67f2f 100755 --- a/Makefile +++ b/Makefile @@ -13,9 +13,10 @@ cross: GOOS=linux GOARCH=arm go build -a -o wrp-arm-linux wrp.go GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go -docker: wrp - GOOS=linux GOARCH=amd64 go build -a -o wrp-amd64-linux wrp.go - GOOS=linux GOARCH=arm64 go build -a -o wrp-arm64-linux wrp.go +docker-local: + docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --load . + +docker-push: docker buildx build --platform linux/amd64,linux/arm64 -t tenox7/wrp:latest --push . clean: