From 99238d21b3c298b412745d602f90b7275085cf24 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sat, 27 Aug 2022 13:13:52 +0100 Subject: [PATCH] cicd: Move make instructions to dockerfile --- var/tekton/gobuilder/Dockerfile | 12 ++++++++---- var/tekton/gobuilder/Makefile | 10 ---------- 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 var/tekton/gobuilder/Makefile diff --git a/var/tekton/gobuilder/Dockerfile b/var/tekton/gobuilder/Dockerfile index 6fe1804..3388ab4 100644 --- a/var/tekton/gobuilder/Dockerfile +++ b/var/tekton/gobuilder/Dockerfile @@ -1,5 +1,9 @@ FROM fedora -RUN dnf install go make -y --exclude=iputils -COPY Makefile ./ -RUN make go-tools - +RUN dnf install go -y --exclude=iputils +RUN go install "github.com/bufbuild/buf/cmd/buf" +RUN go install "github.com/fzipp/gocyclo/cmd/gocyclo" +RUN go install "github.com/go-critic/go-critic/cmd/gocritic" +RUN go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway" +RUN go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" +RUN go install "google.golang.org/grpc/cmd/protoc-gen-go-grpc" +RUN go install "google.golang.org/protobuf/cmd/protoc-gen-go" diff --git a/var/tekton/gobuilder/Makefile b/var/tekton/gobuilder/Makefile deleted file mode 100644 index 00f6168..0000000 --- a/var/tekton/gobuilder/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -go-tools: - go install "github.com/bufbuild/buf/cmd/buf" - go install "github.com/fzipp/gocyclo/cmd/gocyclo" - go install "github.com/go-critic/go-critic/cmd/gocritic" - go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway" - go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" - go install "google.golang.org/grpc/cmd/protoc-gen-go-grpc" - go install "google.golang.org/protobuf/cmd/protoc-gen-go" - -.PHONY: go-tools