Skip to content
This repository has been archived by the owner on Mar 4, 2022. It is now read-only.

Update docker dependency #561

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM golang:1.14-alpine3.11 as builder
RUN apk add --update --no-cache build-base curl git upx && \
rm -rf /var/cache/apk/*

ENV GOLANG_PROTOBUF_VERSION=1.3.1 \
GOGO_PROTOBUF_VERSION=1.2.1
ENV GOLANG_PROTOBUF_VERSION=1.4.2 \
GOGO_PROTOBUF_VERSION=1.3.1
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} \
Expand All @@ -14,7 +14,7 @@ RUN GO111MODULE=on go get \
github.com/gogo/protobuf/protoc-gen-gogoslick@v${GOGO_PROTOBUF_VERSION} && \
mv /go/bin/protoc-gen-go* /usr/local/bin/

ENV GRPC_GATEWAY_VERSION=1.8.5
ENV GRPC_GATEWAY_VERSION=1.14.6
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 && \
Expand All @@ -24,20 +24,19 @@ RUN curl -sSL \
chmod +x /usr/local/bin/protoc-gen-grpc-gateway && \
chmod +x /usr/local/bin/protoc-gen-swagger

ENV GRPC_WEB_VERSION=1.0.4
ENV GRPC_WEB_VERSION=1.1.0
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

ENV YARPC_VERSION=1.37.3
ENV YARPC_VERSION=1.46.0
RUN git clone --depth 1 -b v${YARPC_VERSION} https://github.com/yarpc/yarpc-go.git /go/src/go.uber.org/yarpc && \
cd /go/src/go.uber.org/yarpc && \
GO111MODULE=on go mod init && \
GO111MODULE=on go install ./encoding/protobuf/protoc-gen-yarpc-go && \
mv /go/bin/protoc-gen-yarpc-go /usr/local/bin/

ENV TWIRP_VERSION=5.7.0
ENV TWIRP_VERSION=5.11.0
RUN curl -sSL \
https://github.com/twitchtv/twirp/releases/download/v${TWIRP_VERSION}/protoc-gen-twirp-Linux-x86_64 \
-o /usr/local/bin/protoc-gen-twirp && \
Expand All @@ -47,7 +46,7 @@ RUN curl -sSL \
chmod +x /usr/local/bin/protoc-gen-twirp && \
chmod +x /usr/local/bin/protoc-gen-twirp_python

ENV PROTOBUF_VERSION=3.6.1
ENV PROTOBUF_VERSION=3.12.2
RUN mkdir -p /tmp/protoc && \
curl -sSL \
https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip \
Expand All @@ -74,10 +73,10 @@ WORKDIR /work
ENV \
PROTOTOOL_PROTOC_BIN_PATH=/usr/bin/protoc \
PROTOTOOL_PROTOC_WKT_PATH=/usr/include \
GRPC_VERSION=1.25.0 \
PROTOBUF_VERSION=3.11.2 \
GRPC_VERSION=1.28.1 \
PROTOBUF_VERSION=3.12.2 \
ALPINE_GRPC_VERSION_SUFFIX=r1 \
ALPINE_PROTOBUF_VERSION_SUFFIX=r1
ALPINE_PROTOBUF_VERSION_SUFFIX=r0

RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
apk add --update --no-cache bash curl git grpc=${GRPC_VERSION}-${ALPINE_GRPC_VERSION_SUFFIX} protobuf=${PROTOBUF_VERSION}-${ALPINE_PROTOBUF_VERSION_SUFFIX} && \
Expand All @@ -86,9 +85,9 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/reposit
COPY --from=builder /usr/local/bin /usr/local/bin
COPY --from=builder /usr/local/include /usr/include

ENV GOGO_PROTOBUF_VERSION=1.2.1 \
GOLANG_PROTOBUF_VERSION=1.3.1 \
GRPC_GATEWAY_VERSION=1.8.5 \
GRPC_WEB_VERSION=1.0.4 \
TWIRP_VERSION=5.7.0 \
YARPC_VERSION=1.37.3
ENV GOGO_PROTOBUF_VERSION=1.3.1 \
GOLANG_PROTOBUF_VERSION=1.4.2 \
GRPC_GATEWAY_VERSION=1.14.6 \
GRPC_WEB_VERSION=1.1.0 \
TWIRP_VERSION=5.11.0 \
YARPC_VERSION=1.46.0
42 changes: 30 additions & 12 deletions bazel/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "co_honnef_go_tools",
importpath = "honnef.co/go/tools",
sum = "h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=",
version = "v0.0.1-2019.2.3",
sum = "h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=",
version = "v0.0.1-2020.1.3",
)
go_repository(
name = "com_github_burntsushi_toml",
Expand Down Expand Up @@ -40,8 +40,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_fullstorydev_grpcurl",
importpath = "github.com/fullstorydev/grpcurl",
sum = "h1:rKQyAaegPtCj4mpItnCHd+PIEHspIZl14VWhHYIHhls=",
version = "v1.4.0",
sum = "h1:p8BB6VZF8O7w6MxGr3KJ9E6EVKaswCevSALK6FBtMzA=",
version = "v1.6.0",
)
go_repository(
name = "com_github_gobuffalo_flect",
Expand Down Expand Up @@ -70,8 +70,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_golang_protobuf",
importpath = "github.com/golang/protobuf",
sum = "h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=",
version = "v1.3.4",
sum = "h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=",
version = "v1.3.5",
)
go_repository(
name = "com_github_inconshreveable_mousetrap",
Expand All @@ -82,8 +82,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "com_github_jhump_protoreflect",
importpath = "github.com/jhump/protoreflect",
sum = "h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=",
version = "v1.6.0",
sum = "h1:4/2yi5LyDPP7nN+Hiird1SAJ6YoxUm13/oxHGRnbPd8=",
version = "v1.6.1",
)
go_repository(
name = "com_github_mitchellh_go_wordwrap",
Expand Down Expand Up @@ -166,8 +166,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "org_golang_google_grpc",
importpath = "google.golang.org/grpc",
sum = "h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=",
version = "v1.28.0",
sum = "h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo=",
version = "v1.29.0",
)
go_repository(
name = "org_golang_x_lint",
Expand Down Expand Up @@ -208,8 +208,8 @@ def prototool_deps(**kwargs):
go_repository(
name = "org_golang_x_tools",
importpath = "golang.org/x/tools",
sum = "h1:CuaXjesf8HXc9cSxHpEzHyFF+1FCOpgdxhQ/5vRcYZw=",
version = "v0.0.0-20200311222014-c807066ff753",
sum = "h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM=",
version = "v0.0.0-20200426102838-f3a5411a4c3b",
)
go_repository(
name = "org_uber_go_atomic",
Expand Down Expand Up @@ -715,3 +715,21 @@ def prototool_deps(**kwargs):
sum = "h1:WBZRG4aNOuI15bLRrCgN8fCq8E5Xuty6jGbmSNEvSsU=",
version = "v0.0.0-20191209042840-269d4d468f6f",
)
go_repository(
name = "com_github_gordonklaus_ineffassign",
importpath = "github.com/gordonklaus/ineffassign",
sum = "h1:vc7Dmrk4JwS0ZPS6WZvWlwDflgDTA26jItmbSj83nug=",
version = "v0.0.0-20200309095847-7953dde2c7bf",
)
go_repository(
name = "com_github_nishanths_predeclared",
importpath = "github.com/nishanths/predeclared",
sum = "h1:0NtlnvxTh8fQsQm55+bkvrqgn0zcv+M4TF8otNCuYl4=",
version = "v0.0.0-20190419143655-18a43bb90ffc",
)
go_repository(
name = "com_github_yuin_goldmark",
importpath = "github.com/yuin/goldmark",
sum = "h1:nqDD4MMMQA0lmWq03Z2/myGPYLQoXtmi0rGVs95ntbo=",
version = "v1.1.27",
)
16 changes: 8 additions & 8 deletions docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ to add additional plugins - our recommendation is to instead build your own imag
| Name | Version | Binaries |
| --- | --- | --- |
| prototool | (varies) | prototool |
| [protoc] | 3.6.1 | protoc |
| [grpc] | 1.19.1 | grpc_cpp_plugin<br>grpc_csharp_plugin<br>grpc_node_plugin<br>grpc_objective_c_plugin<br>grpc_php_plugin<br>grpc_python_plugin<br>grpc_ruby_plugin |
| [golang/protobuf] | 1.3.1 | protoc-gen-go |
| [gogo/protobuf] | 1.2.1 | protoc-gen-gofast<br>protoc-gen-gogo<br>protoc-gen-gogofast<br>protoc-gen-gogofaster<br>protoc-gen-gogoslick |
| [grpc-gateway] | 1.8.5 | protoc-gen-grpc-gateway<br>protoc-gen-swagger |
| [grpc-web] | 1.0.4 | protoc-gen-grpc-web |
| [twirp] | 5.7.0 | protoc-gen-twirp<br>protoc-gen-twirp_python |
| [yarpc] | 1.37.3 | protoc-gen-yarpc-go |
| [protoc] | 3.12.2 | protoc |
| [grpc] | 1.28.1 | grpc_cpp_plugin<br>grpc_csharp_plugin<br>grpc_node_plugin<br>grpc_objective_c_plugin<br>grpc_php_plugin<br>grpc_python_plugin<br>grpc_ruby_plugin |
| [golang/protobuf] | 1.4.2 | protoc-gen-go |
| [gogo/protobuf] | 1.3.1 | protoc-gen-gofast<br>protoc-gen-gogo<br>protoc-gen-gogofast<br>protoc-gen-gogofaster<br>protoc-gen-gogoslick |
| [grpc-gateway] | 1.14.6 | protoc-gen-grpc-gateway<br>protoc-gen-swagger |
| [grpc-web] | 1.1.0 | protoc-gen-grpc-web |
| [twirp] | 5.11.0 | protoc-gen-twirp<br>protoc-gen-twirp_python |
| [yarpc] | 1.46.0 | protoc-gen-yarpc-go |

The Well-Known Types are copied to `/usr/include`. The packages `bash`, `curl`, and `git` are also
installed.
Expand Down
18 changes: 9 additions & 9 deletions etc/docker/testing/bin/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ check_dir_not_exists() {
fi
}

check_env GOGO_PROTOBUF_VERSION 1.2.1
check_env GOLANG_PROTOBUF_VERSION 1.3.1
check_env GRPC_VERSION 1.25.0
check_env GRPC_GATEWAY_VERSION 1.8.5
check_env GRPC_WEB_VERSION 1.0.4
check_env PROTOBUF_VERSION 3.11.2
check_env TWIRP_VERSION 5.7.0
check_env YARPC_VERSION 1.37.3
check_env GOGO_PROTOBUF_VERSION 1.3.1
check_env GOLANG_PROTOBUF_VERSION 1.4.2
check_env GRPC_VERSION 1.28.1
check_env GRPC_GATEWAY_VERSION 1.14.6
check_env GRPC_WEB_VERSION 1.1.0
check_env PROTOBUF_VERSION 3.12.2
check_env TWIRP_VERSION 5.11.0
check_env YARPC_VERSION 1.46.0
check_env PROTOTOOL_PROTOC_BIN_PATH /usr/bin/protoc
check_env PROTOTOOL_PROTOC_WKT_PATH /usr/include
check_command_output "libprotoc 3.11.2" protoc --version
check_command_output "libprotoc 3.12.2" protoc --version
check_command_output_file etc/wkt.txt find /usr/include -type f
check_which /usr/bin/protoc
check_which /usr/bin/grpc_cpp_plugin
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ go 1.14

require (
github.com/emicklei/proto v1.9.0
github.com/fullstorydev/grpcurl v1.4.0
github.com/fullstorydev/grpcurl v1.6.0
github.com/gobuffalo/flect v0.2.1
github.com/gofrs/flock v0.7.1
github.com/golang/protobuf v1.3.4
github.com/jhump/protoreflect v1.6.0
github.com/golang/protobuf v1.3.5
github.com/jhump/protoreflect v1.6.1
github.com/mitchellh/go-wordwrap v1.0.0
github.com/spf13/cobra v0.0.6
github.com/spf13/pflag v1.0.5
Expand All @@ -19,8 +19,7 @@ require (
golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/tools v0.0.0-20200311222014-c807066ff753 // indirect
google.golang.org/genproto v0.0.0-20200311144346-b662892dd51b // indirect
google.golang.org/grpc v1.28.0
google.golang.org/grpc v1.29.0
gopkg.in/yaml.v2 v2.2.8
)
Loading