Bump buf and ts-proto version up (#4)

kanziw · Apr 20, 2022 · ecca58f · ecca58f
1 parent 7f42a07
commit ecca58f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,24 +1,11 @@
-FROM golang:1.17.2-alpine3.14 as golang
-
-WORKDIR /app
-
-ARG GO_GRPC_GATEWAY_VERSION=v2.6.0
-
-RUN go install \
-    github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GO_GRPC_GATEWAY_VERSION} \
-    github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@${GO_GRPC_GATEWAY_VERSION}
-
-
-FROM bufbuild/buf:1.0.0-rc6
-
-COPY --from=golang /go/bin/* /usr/local/bin
+FROM bufbuild/buf:1.3.1
 
 RUN apk add --update --no-cache \
-    nodejs=14.18.1-r0 \
-    npm=7.17.0-r0 && \
+    nodejs=16.14.2-r0 \
+    npm=8.1.3-r0 && \
   rm -rf /var/cache/apk/*
 
-ARG TS_PROTO_VERSION=1.83.1
+ARG TS_PROTO_VERSION=1.110.4
 
 RUN npm i -g ts-proto@${TS_PROTO_VERSION}
 

diff --git a/Makefile b/Makefile
@@ -0,0 +1,11 @@
+.PHONY: build
+## build: build Docker image from Dockerfile
+build:
+	docker build . -t kanziw/buf:dev
+
+
+.PHONY: help
+## help: prints this help message
+help:
+	@echo "Usage: \n"
+	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':'