Skip to content

Commit afd3f2f

Browse files
authored
Merge branch 'master' into dependabot/cargo/rust_grpcio_bench/grpcio-0.13.0
2 parents 0ac56f7 + c72a8be commit afd3f2f

File tree

58 files changed

+1434
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1434
-245
lines changed

d_grpc_bench/Dockerfile

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
1-
FROM dlang2/ldc-ubuntu:1.26.0 AS builder
1+
# syntax=docker/dockerfile:1
22

3-
RUN apt update && apt install -y protobuf-compiler git cmake g++
3+
FROM buildpack-deps:bookworm AS builder
4+
5+
RUN set -eux; \
6+
wget -O ldc2-1.40.1-linux-x86_64.tar.xz https://github.com/ldc-developers/ldc/releases/download/v1.40.1/ldc2-1.40.1-linux-x86_64.tar.xz; \
7+
echo "085a593dba4b1385ec03e7521aa97356e5a7d9f6194303eccb3c1e35935c69d8 *ldc2-1.40.1-linux-x86_64.tar.xz" | sha256sum -c -; \
8+
tar --strip-components=1 -C /usr/local -Jxf ldc2-1.40.1-linux-x86_64.tar.xz; \
9+
rm ldc2-1.40.1-linux-x86_64.tar.xz
10+
11+
RUN set -eux; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends \
14+
protobuf-compiler \
15+
git \
16+
cmake \
17+
g++; \
18+
rm -fr /var/lib/apt/lists/*
419

5-
WORKDIR /app
6-
RUN git clone --depth 1 --branch master --recurse-submodules https://github.com/huntlabs/grpc-dlang
7-
WORKDIR /app/grpc-dlang
820
# Building the protocol buffer compiler for D
921
RUN dub build protobuf:protoc-gen-d
22+
23+
WORKDIR /app
24+
RUN git clone https://github.com/huntlabs/grpc-dlang && \
25+
cd grpc-dlang && \
26+
git checkout cce7a8fd14563292adcd562e65afdcc10b9ce3f2 && \
27+
git submodule update --init --depth=1
28+
1029
# Building the gRPC plugin for D
11-
WORKDIR /app/grpc-dlang/compiler
12-
RUN mkdir build
30+
RUN mkdir -p /app/grpc-dlang/compiler/build
1331
WORKDIR /app/grpc-dlang/compiler/build
14-
RUN cmake .. && make -j4
32+
RUN cmake -Dprotobuf_BUILD_TESTS=OFF .. && make -j4
1533
RUN cp deps/protobuf/protoc* /usr/local/bin
1634
RUN cp grpc_dlang_plugin /usr/local/bin
17-
# Building the core library
18-
WORKDIR /app/grpc-dlang
19-
RUN dub build
2035

2136
COPY proto /app/proto
2237
COPY d_grpc_bench /app
@@ -26,7 +41,7 @@ RUN protoc --plugin=protoc-gen-grpc=/usr/local/bin/grpc_dlang_plugin --grpc_out=
2641

2742
RUN dub build -b release
2843

29-
FROM ubuntu:18.04
44+
FROM debian:bookworm-slim AS final
3045
WORKDIR /app
3146
COPY --from=builder /app/server .
3247
ENTRYPOINT [ "/app/server" ]

dotnet_grpc_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0
22

33
WORKDIR /app
44
COPY dotnet_grpc_bench /app

dotnet_grpc_bench/GreeterServer/GreeterServer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Grpc.AspNetCore" Version="2.59.0" />
10+
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
1111

1212
<Protobuf Include="..\..\proto\helloworld\helloworld.proto" Link="helloworld.proto" />
1313
</ItemGroup>

go_connect_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.2-bookworm
1+
FROM golang:1.23.2-bookworm
22

33
WORKDIR /app
44
COPY go_connect_bench /app

go_grpc_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.2-bookworm
1+
FROM golang:1.23.2-bookworm
22

33
WORKDIR /app
44
COPY go_grpc_bench /app

go_vtconnect_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.2-bookworm
1+
FROM golang:1.23.2-bookworm
22

33
WORKDIR /app
44
COPY go_vtconnect_bench /app

go_vtgrpc_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.2-bookworm
1+
FROM golang:1.23.2-bookworm
22

33
WORKDIR /app
44
COPY go_vtgrpc_bench /app

java_aot_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.2.0-b1 as rel
1+
FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.3.3 as rel
22

33
WORKDIR /app
44
COPY java_aot_bench /app
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

java_armeria_bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:22-jdk-jammy
1+
FROM eclipse-temurin:23-jdk-noble
22

33
WORKDIR /app
44
COPY java_armeria_bench /app

0 commit comments

Comments
 (0)