From f11f23c6cd4677b9e038ce30e6afdd32cf4e3dfc Mon Sep 17 00:00:00 2001 From: Mohamed Awnallah Date: Mon, 8 Sep 2025 22:00:18 +0300 Subject: [PATCH] Makefile+tools: optimize LND linter --- Makefile | 3 +-- tools/Dockerfile | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 6a883aa92da..96dbc0f7d07 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,7 @@ endif DOCKER_TOOLS = docker run \ --rm \ - -v $(shell bash -c "$(GOCC) env GOCACHE || (mkdir -p /tmp/go-cache; echo /tmp/go-cache)"):/tmp/build/.cache \ - -v $(shell bash -c "$(GOCC) env GOMODCACHE || (mkdir -p /tmp/go-modcache; echo /tmp/go-modcache)"):/tmp/build/.modcache \ + -v $(shell bash -c "mkdir -p /tmp/go-build-cache; echo /tmp/go-build-cache"):/root/.cache/go-build \ -v $(shell bash -c "mkdir -p /tmp/go-lint-cache; echo /tmp/go-lint-cache"):/root/.cache/golangci-lint \ -v $$(pwd):/build lnd-tools diff --git a/tools/Dockerfile b/tools/Dockerfile index 1b5a3972ff2..1077040fe69 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -1,19 +1,20 @@ -FROM golang:1.24.6 +FROM golang:1.24.6-alpine -RUN apt-get update && apt-get install -y git -ENV GOCACHE=/tmp/build/.cache -ENV GOMODCACHE=/tmp/build/.modcache +ENV GOFLAGS="-buildvcs=false" -COPY . /tmp/tools +RUN apk update && apk add --no-cache git -RUN cd /tmp \ - && mkdir -p /tmp/build/.cache \ - && mkdir -p /tmp/build/.modcache \ - && cd /tmp/tools \ - && CGO_ENABLED=0 go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \ +WORKDIR /tmp/tools + +COPY . ./ + +RUN CGO_ENABLED=0 go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \ && CGO_ENABLED=0 golangci-lint custom \ && mv ./custom-gcl /usr/local/bin/custom-gcl \ - && chmod -R 777 /tmp/build/ \ - && git config --global --add safe.directory /build + && git config --global --add safe.directory /build \ + && rm -rf /go/pkg/mod \ + && rm -rf /root/.cache/go-build \ + && rm -rf /var/cache/apk/* \ + && rm -rf /tmp/* WORKDIR /build