Просмотр исходного кода

cicd: Move make instructions to dockerfile

jamesread 3 лет назад
Родитель
Сommit
99238d21b3
2 измененных файлов с 8 добавлено и 14 удалено
  1. 8 4
      var/tekton/gobuilder/Dockerfile
  2. 0 10
      var/tekton/gobuilder/Makefile

+ 8 - 4
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"

+ 0 - 10
var/tekton/gobuilder/Makefile

@@ -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