Switch to latest prototool and other generators

Author: charithe

Dockerfile

@@ -1,50 +1,62 @@
-FROM golang:1.11-alpine AS build
-ARG PROTOTOOL_VERSION=1.3.0
-ARG PROTOC_VERSION=3.6.1
-ARG PROTOC_GEN_GO_VERSION=1.2.0
-ARG PROTOC_GEN_GOGO_VERSION=1.1.1
-ARG PROTOC_GEN_JAVA_GRPC_VERSION=1.16.1
-ARG PROTOC_GEN_VALIDATE_VERSION=0.0.10
-
-RUN apk --no-cache add --update curl git libc6-compat make
-RUN \
-  curl -sSL https://github.com/uber/prototool/releases/download/v$PROTOTOOL_VERSION/prototool-Linux-x86_64 -o /bin/prototool && \
-  chmod +x /bin/prototool
-RUN \
-  mkdir /tmp/prototool-bootstrap && \
-  echo $'protoc:\n  version:' $PROTOC_VERSION > /tmp/prototool-bootstrap/prototool.yaml && \
-  echo 'syntax = "proto3";' > /tmp/prototool-bootstrap/tmp.proto && \
-  prototool compile /tmp/prototool-bootstrap && \
-  rm -rf /tmp/prototool-bootstrap
-RUN go get github.com/golang/protobuf/... && \
-  cd /go/src/github.com/golang/protobuf && \
-  git checkout v$PROTOC_GEN_GO_VERSION && \
-  go install ./protoc-gen-go
-RUN go get github.com/gogo/protobuf/... && \
-  cd /go/src/github.com/gogo/protobuf && \
-  git checkout v$PROTOC_GEN_GOGO_VERSION && \
-  go install ./protoc-gen-gogofast ./protoc-gen-gogofaster ./protoc-gen-gogoslick
-RUN go get -d github.com/lyft/protoc-gen-validate && \
-  cd /go/src/github.com/lyft/protoc-gen-validate && \
-  git checkout v$PROTOC_GEN_VALIDATE_VERSION && \
-  make build
-RUN curl -sSL https://search.maven.org/remotecontent?filepath=io/grpc/protoc-gen-grpc-java/$PROTOC_GEN_JAVA_GRPC_VERSION/protoc-gen-grpc-java-$PROTOC_GEN_JAVA_GRPC_VERSION-linux-x86_64.exe -o /bin/protoc-gen-grpc-java && \
-    chmod +x /bin/protoc-gen-grpc-java
-
-FROM alpine:3.8
-WORKDIR /in
-RUN apk --no-cache add --update libc6-compat 
-COPY --from=build /bin/prototool /bin/prototool
-COPY --from=build /root/.cache/prototool /.cache/prototool
-COPY --from=build /go/bin/protoc-gen-go /bin/protoc-gen-go
-COPY --from=build /go/bin/protoc-gen-gogofast /bin/protoc-gen-gogofast
-COPY --from=build /go/bin/protoc-gen-gogofaster /bin/protoc-gen-gogofaster
-COPY --from=build /go/bin/protoc-gen-gogoslick /bin/protoc-gen-gogoslick
-COPY --from=build /go/bin/protoc-gen-validate /bin/protoc-gen-validate
-COPY --from=build /go/src/github.com/lyft/protoc-gen-validate/validate /include/validate
-COPY --from=build /bin/protoc-gen-grpc-java /bin/protoc-gen-grpc-java
-
-RUN chmod -R 755 /.cache
-ENTRYPOINT ["/bin/prototool"]
+FROM golang:1.12.4-alpine3.9 AS build
 
+ARG PROTOTOOL_VERSION=1.6.0
+ARG PROTOC_GEN_JAVA_GRPC_VERSION=1.20.0
+ARG GOLANG_PROTOBUF_VERSION=1.3.1
+ARG GOGO_PROTOBUF_VERSION=1.2.1
+ARG GRPC_GATEWAY_VERSION=1.8.5
+ARG GRPC_WEB_VERSION=1.0.4
 
+RUN apk --no-cache add --update curl git libc6-compat make upx
+
+RUN GO111MODULE=on go get \
+  github.com/uber/prototool/cmd/prototool@v${PROTOTOOL_VERSION} && \
+  mv /go/bin/prototool /usr/local/bin
+
+RUN GO111MODULE=on go get \
+  github.com/golang/protobuf/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} \
+  github.com/gogo/protobuf/protoc-gen-gofast@v${GOGO_PROTOBUF_VERSION} \
+  github.com/gogo/protobuf/protoc-gen-gogo@v${GOGO_PROTOBUF_VERSION} \
+  github.com/gogo/protobuf/protoc-gen-gogofast@v${GOGO_PROTOBUF_VERSION} \
+  github.com/gogo/protobuf/protoc-gen-gogofaster@v${GOGO_PROTOBUF_VERSION} \
+  github.com/gogo/protobuf/protoc-gen-gogoslick@v${GOGO_PROTOBUF_VERSION} && \
+  mv /go/bin/protoc-gen-go* /usr/local/bin/ 
+  
+RUN go get -d github.com/gogo/protobuf/gogoproto && \
+  mkdir -p /usr/include/gogoproto && \
+  mv /go/src/github.com/gogo/protobuf/gogoproto/gogo.proto /usr/include/gogoproto/gogo.proto
+
+RUN curl -sSL \
+  https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v${GRPC_GATEWAY_VERSION}/protoc-gen-grpc-gateway-v${GRPC_GATEWAY_VERSION}-linux-x86_64 \
+  -o /usr/local/bin/protoc-gen-grpc-gateway && \
+  curl -sSL \
+  https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v${GRPC_GATEWAY_VERSION}/protoc-gen-swagger-v${GRPC_GATEWAY_VERSION}-linux-x86_64 \
+  -o /usr/local/bin/protoc-gen-swagger && \
+  chmod +x /usr/local/bin/protoc-gen-grpc-gateway && \
+  chmod +x /usr/local/bin/protoc-gen-swagger
+
+RUN curl -sSL \
+  https://github.com/grpc/grpc-web/releases/download/${GRPC_WEB_VERSION}/protoc-gen-grpc-web-${GRPC_WEB_VERSION}-linux-x86_64 \
+  -o /usr/local/bin/protoc-gen-grpc-web && \
+  chmod +x /usr/local/bin/protoc-gen-grpc-web
+
+RUN go get -d github.com/envoyproxy/protoc-gen-validate && \
+  cd /go/src/github.com/envoyproxy/protoc-gen-validate && \
+  make build && \
+  mv /go/bin/protoc-gen-validate /usr/local/bin && \
+  mkdir -p /usr/include/validate && \
+  mv /go/src/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto /usr/include/validate/validate.proto
+
+RUN curl -sSL https://search.maven.org/remotecontent?filepath=io/grpc/protoc-gen-grpc-java/$PROTOC_GEN_JAVA_GRPC_VERSION/protoc-gen-grpc-java-$PROTOC_GEN_JAVA_GRPC_VERSION-linux-x86_64.exe -o /usr/local/bin/protoc-gen-grpc-java && \
+    chmod +x /usr/local/bin/protoc-gen-grpc-java
+
+RUN upx --lzma /usr/local/bin/*
+
+FROM alpine:3.9
+ENV PROTOTOOL_CACHE_PATH=/tmp
+ENV LD_LIBRARY_PATH=/lib64:/lib
+WORKDIR /work
+RUN apk --no-cache add --update ca-certificates libc6-compat
+COPY --from=build /usr/local/bin /usr/local/bin
+COPY --from=build /usr/include /usr/include 
+RUN chmod -R 755 /usr/include

README.md

@@ -5,31 +5,34 @@ Prototool Docker Helper
 
 
 Docker image with [prototool](https://github.com/uber/prototool), [gogoproto](https://github.com/gogo/protobuf),
-[protoc-gen-validate](https://github.com/lyft/protoc-gen-validate) and `protoc-gen-grpc-java` pre-installed.
+[protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate), [grpc-gateway](https://github.com/grpc-ecosystem/grpc-gateway), [grpc-web](https://github.com/grpc/grpc-web) and `protoc-gen-grpc-java` pre-installed.
 
-The accompanying `prototool.sh` script mounts the current working directory as `/in` and runs the Docker image
+The accompanying `prototool.sh` script mounts the current working directory as `/work` and runs the Docker image
 as the current user. This results in the generated artifacts having the correct permissions.
 
 
 Installation
 ------------
 
 ```shell
-curl -o prototool.sh https://raw.githubusercontent.com/charithe/prototool-docker/v0.0.2/prototool.sh
+curl -o prototool.sh https://raw.githubusercontent.com/charithe/prototool-docker/v0.1.0/prototool.sh
 ```
 
 Optionally, add `prototool.sh` to your `PATH`.
 
 Usage
 -----
 
+See [example](example) for a full example.
+
+
 Create a `prototool.yaml` file in your project root as usual. For example:
 
 ```yaml
 protoc:
-  version: 3.6.1
-  include:
-    - /include
+  version: 3.7.1
+  includes:
+    - /usr/include
 
 lint:
   rules:
@@ -38,35 +41,33 @@ lint:
 
 generate:
   go_options:
-    import_path: github.com/charithe/grpc-gizmo
+    import_path: github.com/charithe/telemetry
 
   plugins:
     - name: gogofast
       type: gogo
-      path: /bin/protoc-gen-gogofast
       flags: plugins=grpc
-      output: ./go/pkg/v1pb
+      output: ./go/pkg/gen
     - name: validate
-      path: /bin/protoc-gen-validate
       flags: lang=go
-      output: ./go/pkg/v1pb
+      output: ./go/pkg/gen
     - name: java
       output: ./java/src/main/java
     - name: grpc-java
-      path: /bin/protoc-gen-grpc-java
       output: ./java/src/main/java
+
+
 ```
 
 Prototool can now be invoked as follows:
 
 ```shell
 # Lint
-/path/to/prototool.sh lint 
+./prototool.sh lint
 
 # Compile
-/path/to/prototool.sh compile 
+./prototool.sh compile
 
 # All
-/path/to/prototool.sh all 
+./prototool.sh all
 ```
-

example/build.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 USER="$(id -u):$(id -g)"
-
-rm -rf go java
-docker run --rm --user $USER -i -t -v $(pwd):/in charithe/prototool-docker all
+docker run -it \
+    --rm \
+    --user $USER \
+    --mount type=bind,source="$(pwd)",target=/work \
+    --tmpfs /tmp:exec \
+    charithe/prototool-docker prototool $@

example/proto/telemetry.proto

@@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto";
 import "validate/validate.proto";
 
 service Telemetry {
-  // Record receives and persists telemetry data from remote devices 
+  // Record receives and persists telemetry data from remote devices
   rpc Record(RecordRequest) returns (RecordResponse);
 }
 
@@ -53,7 +53,7 @@ message TelemetryData {
 message LogEntry {
   // timestamp must be after 2018-01-01
   google.protobuf.Timestamp timestamp = 1 [(validate.rules).timestamp.gte.seconds = 1514764800];
-  // component must be at least 5 characters long 
+  // component must be at least 5 characters long
   string component = 2 [(validate.rules).string.min_len = 5];
   // state must be at least 10 bytes long
   bytes state = 3 [(validate.rules).bytes.min_len = 10];

example/prototool.yaml

@@ -1,7 +1,7 @@
 protoc:
-  version: 3.6.1
+  version: 3.7.1
   includes:
-    - /include
+    - /usr/include
 
 lint:
   rules:
@@ -15,17 +15,14 @@ generate:
   plugins:
     - name: gogofast
       type: gogo
-      path: /bin/protoc-gen-gogofast
       flags: plugins=grpc
       output: ./go/pkg/gen
     - name: validate
-      path: /bin/protoc-gen-validate
       flags: lang=go
       output: ./go/pkg/gen
     - name: java
       output: ./java/src/main/java
     - name: grpc-java
-      path: /bin/protoc-gen-grpc-java
       output: ./java/src/main/java
 
 

prototool.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 
 USER="$(id -u):$(id -g)"
-docker run --rm --user $USER -i -t -v $(pwd):/in charithe/prototool-docker $@
+docker run -it \
+    --rm \
+    --user $USER \
+    --mount type=bind,source="$(pwd)",target=/work \
+    --tmpfs /tmp:exec \
+    charithe/prototool-docker prototool $@