Skip to content

Commit 34b1efa

Browse files
authored
Merge pull request #55 from TheThingsIndustries/feature/update
2 parents c109548 + d1130a9 commit 34b1efa

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ RUN mkdir -p /out
1212
ARG GRPC_VERSION
1313
RUN git clone --recursive --depth=1 -b v${GRPC_VERSION} https://github.com/grpc/grpc.git /grpc && \
1414
ln -s /grpc/third_party/protobuf /protobuf && \
15-
mkdir -p "/grpc/cmake/build" && \
16-
cd "/grpc/cmake/build" && \
15+
mkdir -p /grpc/cmake/build && \
16+
cd /grpc/cmake/build && \
1717
cmake \
1818
-GNinja \
1919
-DBUILD_SHARED_LIBS=ON \

build.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ docker build \
44
--build-arg DART_PROTOBUF_VERSION="${DART_PROTOBUF_VERSION:-"1.0.1"}" \
55
--build-arg DART_VERSION="${DART_VERSION:-"2.7.2"}" \
66
--build-arg GO_VERSION="${GO_VERSION:-"1.14.3"}" \
7-
--build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"1.14.5"}" \
7+
--build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"1.14.6"}" \
88
--build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.29.0"}" \
9-
--build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.0"}" \
10-
--build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"0.10.0"}" \
11-
--build-arg GRPC_VERSION="${GRPC_VERSION:-"1.28.1"}" \
12-
--build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.0.7"}" \
9+
--build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.1"}" \
10+
--build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"0.11.0"}" \
11+
--build-arg GRPC_VERSION="${GRPC_VERSION:-"1.28.2"}" \
12+
--build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.1.0"}" \
1313
--build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.3.3"}" \
1414
--build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.3.2"}" \
1515
--build-arg PROTOC_GEN_FIELDMASK_VERSION="${PROTOC_GEN_FIELDMASK_VERSION:-"0.4.3"}" \
@@ -20,7 +20,7 @@ docker build \
2020
--build-arg PROTOC_GEN_LINT_VERSION="${PROTOC_GEN_LINT_VERSION:-"0.2.1"}" \
2121
--build-arg PROTOC_GEN_VALIDATE_VERSION="${PROTOC_GEN_VALIDATE_VERSION:-"0.3.0-java"}" \
2222
--build-arg RUST_PROTOBUF_VERSION="${RUST_PROTOBUF_VERSION:-"2.14.0"}" \
23-
--build-arg RUST_VERSION="${RUST_VERSION:-"1.43.0"}" \
23+
--build-arg RUST_VERSION="${RUST_VERSION:-"1.44.0"}" \
2424
--build-arg SWIFT_VERSION="${SWIFT_VERSION:-"5.1.5"}" \
2525
--build-arg UPX_VERSION="${UPX_VERSION:-"3.96"}" \
2626
${@} .

0 commit comments

Comments
 (0)