Skip to content

Commit 2ba5e5c

Browse files
author
Damien Goldenberg
authored
New go protoc (#85)
1 parent cfca498 commit 2ba5e5c

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ RUN mkdir -p ${GOPATH}/src/github.com/grpc/grpc-go && \
7676
install -Ds /golang-protobuf-out/protoc-gen-go-grpc /out/usr/bin/protoc-gen-go-grpc
7777

7878
ARG PROTOC_GEN_GO_VERSION
79-
RUN mkdir -p ${GOPATH}/src/github.com/golang/protobuf && \
80-
curl -sSL https://api.github.com/repos/golang/protobuf/tarball/v${PROTOC_GEN_GO_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/github.com/golang/protobuf &&\
81-
cd ${GOPATH}/src/github.com/golang/protobuf && \
82-
go build -ldflags '-w -s' -o /golang-protobuf-out/protoc-gen-go ./protoc-gen-go && \
79+
RUN mkdir -p ${GOPATH}/src/google.golang.org/protobuf && \
80+
curl -sSL https://api.github.com/repos/protocolbuffers/protobuf-go/tarball/v${PROTOC_GEN_GO_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/google.golang.org/protobuf &&\
81+
cd ${GOPATH}/src/google.golang.org/protobuf && \
82+
go build -ldflags '-w -s' -o /golang-protobuf-out/protoc-gen-go ./cmd/protoc-gen-go && \
8383
install -Ds /golang-protobuf-out/protoc-gen-go /out/usr/bin/protoc-gen-go
8484

8585
ARG PROTOC_GEN_GOGO_VERSION

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It started out as https://github.com/znly/docker-protobuf fork, but grew into a
1313
- [envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate)
1414
- [mwitkow/go-proto-validators](https://github.com/mwitkow/go-proto-validators)
1515
- [gogo/protobuf](https://github.com/gogo/protobuf)
16-
- [golang/protobuf](https://github.com/golang/protobuf)
16+
- [golang/protobuf](https://github.com/protocolbuffers/protobuf-go)
1717
- [google/protobuf](https://github.com/google/protobuf)
1818
- [grpc-ecosystem/grpc-gateway](https://github.com/grpc-ecosystem/grpc-gateway)
1919
- [grpc/grpc](https://github.com/grpc/grpc)
@@ -27,6 +27,7 @@ It started out as https://github.com/znly/docker-protobuf fork, but grew into a
2727
- [stepancheg/grpc-rust](https://github.com/stepancheg/grpc-rust)
2828
- [stepancheg/rust-protobuf](https://github.com/stepancheg/rust-protobuf)
2929
- [chrusty/protoc-gen-jsonschema](https://github.com/chrusty/protoc-gen-jsonschema)
30+
- [moul/protoc-gen-gotemplate](https://github.com/moul/protoc-gen-gotemplate)
3031

3132
## Supported languages
3233
- C

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ docker build \
1515
--build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.3.3"}" \
1616
--build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.4.1"}" \
1717
--build-arg PROTOC_GEN_GO_GRPC_VERSION="${PROTOC_GEN_GO_GRPC_VERSION:-"1.36.0"}" \
18-
--build-arg PROTOC_GEN_GO_VERSION="${PROTOC_GEN_GO_VERSION:-"1.5.1"}" \
18+
--build-arg PROTOC_GEN_GO_VERSION="${PROTOC_GEN_GO_VERSION:-"1.27.1"}" \
1919
--build-arg PROTOC_GEN_GOGO_VERSION="${PROTOC_GEN_GOGO_VERSION:-"1.3.2"}" \
2020
--build-arg PROTOC_GEN_GOVALIDATORS_VERSION="${PROTOC_GEN_GOVALIDATORS_VERSION:-"0.3.2"}" \
2121
--build-arg PROTOC_GEN_GQL_VERSION="${PROTOC_GEN_GQL_VERSION:-"0.8.0"}" \

0 commit comments

Comments
 (0)