Skip to content

Commit 399767f

Browse files
authored
Merge pull request #18 from TheThingsIndustries/feature/update
Update dependencies
2 parents f5d8d6f + c36a266 commit 399767f

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN git clone --recursive --depth=1 -b v${GRPC_VERSION} https://github.com/grpc/
2323

2424
ARG PROTOBUF_C_VERSION
2525
RUN mkdir -p /protobuf-c && \
26-
curl -sSL https://api.github.com/repos/protobuf-c/protobuf-c/tarball/v${PROTOBUF_C_VERSION} | tar xz --strip 1 -C /protobuf-c && \
26+
curl -sSL https://api.github.com/repos/protobuf-c/protobuf-c/tarball/${PROTOBUF_C_VERSION} | tar xz --strip 1 -C /protobuf-c && \
2727
cd /protobuf-c && \
2828
./autogen.sh && \
2929
./configure --prefix=/usr && \
@@ -100,12 +100,12 @@ RUN cd / && \
100100
install -Ds /protoc-gen-lint-out/protoc-gen-lint /out/usr/bin/protoc-gen-lint
101101

102102
ARG PROTOC_GEN_VALIDATE_VERSION
103-
RUN mkdir -p ${GOPATH}/src/github.com/lyft/protoc-gen-validate && \
104-
curl -sSL https://api.github.com/repos/lyft/protoc-gen-validate/tarball/v${PROTOC_GEN_VALIDATE_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/github.com/lyft/protoc-gen-validate && \
105-
cd ${GOPATH}/src/github.com/lyft/protoc-gen-validate && \
103+
RUN mkdir -p ${GOPATH}/src/github.com/envoyproxy/protoc-gen-validate && \
104+
curl -sSL https://api.github.com/repos/envoyproxy/protoc-gen-validate/tarball/v${PROTOC_GEN_VALIDATE_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/github.com/envoyproxy/protoc-gen-validate && \
105+
cd ${GOPATH}/src/github.com/envoyproxy/protoc-gen-validate && \
106106
go build -ldflags '-w -s' -o /protoc-gen-validate-out/protoc-gen-validate . && \
107107
install -Ds /protoc-gen-validate-out/protoc-gen-validate /out/usr/bin/protoc-gen-validate && \
108-
install -D ./validate/validate.proto /out/usr/include/github.com/lyft/protoc-gen-validate/validate/validate.proto
108+
install -D ./validate/validate.proto /out/usr/include/github.com/envoyproxy/protoc-gen-validate/validate/validate.proto
109109

110110
ARG GRPC_GATEWAY_VERSION
111111
RUN mkdir -p ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && \
@@ -169,7 +169,6 @@ COPY --from=go_builder /out/ /out/
169169
COPY --from=rust_builder /out/ /out/
170170
COPY --from=swift_builder /protoc-gen-swift /out/protoc-gen-swift
171171
RUN upx --lzma \
172-
/out/usr/bin/protoc \
173172
/out/usr/bin/grpc_* \
174173
/out/usr/bin/protoc-gen-*
175174
RUN find /out -name "*.a" -delete -or -name "*.la" -delete

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
ALPINE_VERSION ?= 3.8
2-
GO_VERSION ?= 1.11.10
3-
GRPC_GATEWAY_VERSION ?= 1.9.0
4-
GRPC_JAVA_VERSION ?= 1.20.0
1+
ALPINE_VERSION ?= 3.9
2+
GO_VERSION ?= 1.12.6
3+
GRPC_GATEWAY_VERSION ?= 1.9.1
4+
GRPC_JAVA_VERSION ?= 1.21.0
55
GRPC_RUST_VERSION ?= 0.6.1
66
GRPC_SWIFT_VERSION ?= 0.9.0
7-
GRPC_VERSION ?= 1.19.1
7+
GRPC_VERSION ?= 1.21.3
88
GRPC_WEB_VERSION ?= 1.0.4
9-
PROTOBUF_C_VERSION ?= 1.3.1
9+
PROTOBUF_C_VERSION ?= d712e0c52d6047588ed724aa367923b6cb5b6e92
1010
PROTOC_GEN_DOC_VERSION ?= 1.3.0
11-
PROTOC_GEN_FIELDMASK_VERSION ?= 0.1.2
11+
PROTOC_GEN_FIELDMASK_VERSION ?= 0.1.3
1212
PROTOC_GEN_GO_VERSION ?= 1.3.1
1313
PROTOC_GEN_GOGO_VERSION ?= 1.2.1
1414
PROTOC_GEN_GOGOTTN_VERSION ?= 3.0.12
1515
PROTOC_GEN_LINT_VERSION ?= 0.2.1
16-
PROTOC_GEN_VALIDATE_VERSION ?= 0.0.14
17-
RUST_PROTOBUF_VERSION ?= 2.6.0
18-
RUST_VERSION ?= 1.34.2
16+
PROTOC_GEN_VALIDATE_VERSION ?= 0.1.0
17+
RUST_PROTOBUF_VERSION ?= 2.6.2
18+
RUST_VERSION ?= 1.35.0
1919
SWIFT_VERSION ?= 5.0.1
2020
UPX_VERSION ?= 3.95
2121

0 commit comments

Comments
 (0)