From 6f3f0f75b6b75a7936b627578e251c7c796a1447 Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 13 Oct 2021 19:10:35 +0200 Subject: [PATCH] Install tools depedencies using go list --- Dockerfile | 1 + Makefile | 3 +-- docker/ci.Dockerfile | 1 + docker/tmpl.Dockerfile | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 675e94acc..960b2accc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ WORKDIR /build COPY Makefile . COPY go.mod . COPY go.sum . +COPY tools.go . RUN make install RUN go mod download diff --git a/Makefile b/Makefile index 34f123bf9..3150418f9 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,7 @@ clean: rm -rf dist/ install: - go install github.com/golang/mock/mockgen - go install github.com/alvaroloes/enumer + go install $$(go list -f '{{join .Imports " "}}' tools.go) install-ui: npm ci diff --git a/docker/ci.Dockerfile b/docker/ci.Dockerfile index 99cda0387..83cbddd74 100644 --- a/docker/ci.Dockerfile +++ b/docker/ci.Dockerfile @@ -12,6 +12,7 @@ RUN apk update && apk add --no-cache git ca-certificates tzdata alpine-sdk && up COPY Makefile . COPY go.mod . COPY go.sum . +COPY tools.go . RUN make install RUN go mod download diff --git a/docker/tmpl.Dockerfile b/docker/tmpl.Dockerfile index 2877c8d2c..2e9b5b703 100644 --- a/docker/tmpl.Dockerfile +++ b/docker/tmpl.Dockerfile @@ -31,6 +31,7 @@ WORKDIR /build COPY Makefile . COPY go.mod . COPY go.sum . +COPY tools.go . RUN make install RUN go mod download