Skip to content

Commit 0276bf7

Browse files
Update grpc and apple (#2625)
### grpc - cpp: v1.82.1 → v1.83.0 - csharp: v1.82.1 → v1.83.0 - java: v1.82.2 → v1.83.0 - objc: v1.82.1 → v1.83.0 - php: v1.82.1 → v1.83.0 - python: v1.82.1 → v1.83.0 - ruby: v1.82.1 → v1.83.0 ### apple - servicetalk: v0.42.64 → v0.42.65 Co-authored-by: app-token-plugins[bot] <app-token-plugins[bot]@users.noreply.github.com>
1 parent d6ad08a commit 0276bf7

43 files changed

Lines changed: 498 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*
2+
!Dockerfile
3+
!pom.xml
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# syntax=docker/dockerfile:1.24
2+
FROM debian:trixie-20260713@sha256:fac46bff2e02f51425b6e33b0e1169f55dfb053d83511ca28aa50c09fd5ed7a4 AS build
3+
4+
WORKDIR /app
5+
RUN apt-get update \
6+
&& apt-get install -y curl
7+
RUN curl -fsSL -o servicetalk-grpc-protoc.jar https://repo1.maven.org/maven2/io/servicetalk/servicetalk-grpc-protoc/0.42.65/servicetalk-grpc-protoc-0.42.65-all.jar
8+
9+
FROM eclipse-temurin:25-jdk@sha256:201fbb8886b2d273218aa3a192f0afbf7b5ff65ee8cc6ef47f5dce2171f013ea AS jre
10+
RUN jlink --add-modules java.base,java.compiler,java.instrument,java.logging,java.management,jdk.unsupported \
11+
--strip-debug --no-man-pages --no-header-files --output /jre
12+
13+
FROM gcr.io/distroless/cc-debian13:latest@sha256:ed7c407fd64eb0af9dddb9456b94cee188a40a7f53cf38c9836e1e9ae14fca02 AS base
14+
15+
FROM maven:3.9.11-eclipse-temurin-21 AS maven-deps
16+
COPY pom.xml /tmp/pom.xml
17+
RUN cd /tmp && mvn -f pom.xml dependency:go-offline
18+
19+
FROM scratch
20+
COPY --from=base --link / /
21+
COPY --from=jre --link /jre /jre
22+
COPY --from=build --link --chmod=0755 --chown=root:root /app/servicetalk-grpc-protoc.jar .
23+
COPY --from=maven-deps /root/.m2/repository /maven-repository
24+
USER nobody
25+
ENTRYPOINT [ "/jre/bin/java", "-jar", "/servicetalk-grpc-protoc.jar"]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
version: v1
2+
name: buf.build/apple/servicetalk
3+
plugin_version: v0.42.65
4+
source_url: https://github.com/apple/servicetalk
5+
integration_guide_url: https://docs.servicetalk.io/
6+
description: A networking framework that evolves with your application.
7+
deps:
8+
- plugin: buf.build/protocolbuffers/java:v35.1
9+
output_languages:
10+
- java
11+
spdx_license_id: Apache-2.0
12+
license_url: https://github.com/apple/servicetalk/blob/0.42.65/LICENSE.txt
13+
registry:
14+
maven:
15+
deps:
16+
- io.servicetalk:servicetalk-data-protobuf:0.42.65
17+
- io.servicetalk:servicetalk-grpc-api:0.42.65
18+
- io.servicetalk:servicetalk-grpc-protobuf:0.42.65
19+
# Add direct dependency on newer protobuf
20+
- com.google.protobuf:protobuf-java:4.35.1
21+
opts:
22+
- javaDocs=false
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<project>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>temp</groupId>
4+
<artifactId>temp</artifactId>
5+
<version>1.0</version>
6+
<dependencies>
7+
<dependency>
8+
<groupId>io.servicetalk</groupId>
9+
<artifactId>servicetalk-data-protobuf</artifactId>
10+
<version>0.42.65</version>
11+
</dependency>
12+
<dependency>
13+
<groupId>io.servicetalk</groupId>
14+
<artifactId>servicetalk-grpc-api</artifactId>
15+
<version>0.42.65</version>
16+
</dependency>
17+
<dependency>
18+
<groupId>io.servicetalk</groupId>
19+
<artifactId>servicetalk-grpc-protobuf</artifactId>
20+
<version>0.42.65</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>com.google.protobuf</groupId>
24+
<artifactId>protobuf-java</artifactId>
25+
<version>4.35.1</version>
26+
</dependency>
27+
<!-- lite -->
28+
<dependency>
29+
<groupId>com.google.protobuf</groupId>
30+
<artifactId>protobuf-javalite</artifactId>
31+
<version>4.35.1</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>build.buf</groupId>
35+
<artifactId>protobuf-javalite</artifactId>
36+
<version>4.35.1</version>
37+
</dependency>
38+
</dependencies>
39+
</project>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!Dockerfile
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# syntax=docker/dockerfile:1.24
2+
FROM debian:trixie-20260713@sha256:fac46bff2e02f51425b6e33b0e1169f55dfb053d83511ca28aa50c09fd5ed7a4 AS build
3+
4+
ARG TARGETARCH
5+
ARG BAZEL_OPTS="--host_jvm_args=-Djava.net.preferIPv4Stack=true"
6+
7+
RUN apt-get update \
8+
&& apt-get install -y curl git cmake build-essential autoconf clang libc++-dev libtool pkg-config unzip zip
9+
RUN curl -fsSL -o /usr/local/bin/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.26.0/bazelisk-linux-${TARGETARCH} \
10+
&& chmod +x /usr/local/bin/bazelisk \
11+
&& mkdir /build \
12+
&& chown nobody:nogroup /build \
13+
&& usermod --home /build nobody
14+
15+
USER nobody
16+
WORKDIR /build
17+
18+
RUN git clone --depth 1 --branch v1.83.0 https://github.com/grpc/grpc
19+
WORKDIR /build/grpc
20+
RUN bazelisk ${BAZEL_OPTS} build //src/compiler:grpc_plugin_support
21+
RUN bazelisk ${BAZEL_OPTS} build //src/compiler:grpc_cpp_plugin
22+
23+
FROM gcr.io/distroless/cc-debian13:latest@sha256:ed7c407fd64eb0af9dddb9456b94cee188a40a7f53cf38c9836e1e9ae14fca02 AS base
24+
25+
FROM scratch
26+
COPY --link --from=base / /
27+
COPY --link --from=build --chmod=0755 /build/grpc/bazel-bin/src/compiler/grpc_cpp_plugin_binary .
28+
USER nobody
29+
ENTRYPOINT ["/grpc_cpp_plugin_binary"]
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: v1
2+
name: buf.build/grpc/cpp
3+
plugin_version: v1.83.0
4+
source_url: https://github.com/grpc/grpc
5+
description: Generates C++ client and server stubs for the gRPC framework.
6+
deps:
7+
- plugin: buf.build/protocolbuffers/cpp:v35.1
8+
output_languages:
9+
- cpp
10+
spdx_license_id: Apache-2.0
11+
license_url: https://github.com/grpc/grpc/blob/v1.83.0/LICENSE
12+
registry:
13+
cmake: {}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*
2+
!Dockerfile
3+
!build.csproj
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# syntax=docker/dockerfile:1.24
2+
FROM debian:trixie-20260713@sha256:fac46bff2e02f51425b6e33b0e1169f55dfb053d83511ca28aa50c09fd5ed7a4 AS build
3+
4+
ARG TARGETARCH
5+
ARG BAZEL_OPTS="--host_jvm_args=-Djava.net.preferIPv4Stack=true"
6+
7+
RUN apt-get update \
8+
&& apt-get install -y curl git cmake build-essential autoconf clang libc++-dev libtool pkg-config unzip zip
9+
RUN curl -fsSL -o /usr/local/bin/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.26.0/bazelisk-linux-${TARGETARCH} \
10+
&& chmod +x /usr/local/bin/bazelisk \
11+
&& mkdir /build \
12+
&& chown nobody:nogroup /build \
13+
&& usermod --home /build nobody
14+
15+
USER nobody
16+
WORKDIR /build
17+
18+
RUN git clone --depth 1 --branch v1.83.0 https://github.com/grpc/grpc
19+
WORKDIR /build/grpc
20+
RUN bazelisk ${BAZEL_OPTS} build //src/compiler:grpc_plugin_support
21+
RUN bazelisk ${BAZEL_OPTS} build //src/compiler:grpc_csharp_plugin
22+
23+
FROM mcr.microsoft.com/dotnet/sdk:8.0.423-bookworm-slim@sha256:89ce6291bde9acdf59594e79fb8277c6d84c46e4b1f5bf126a4f18766e4bd597 AS dotnetrestore
24+
WORKDIR /build
25+
COPY --link ./build.csproj /build/build.csproj
26+
RUN mkdir /nuget && dotnet restore --packages /nuget
27+
28+
FROM gcr.io/distroless/cc-debian13:latest@sha256:ed7c407fd64eb0af9dddb9456b94cee188a40a7f53cf38c9836e1e9ae14fca02 AS base
29+
30+
FROM scratch
31+
COPY --link --from=base / /
32+
COPY --link --from=dotnetrestore /nuget /nuget
33+
COPY --link --from=build --chmod=0755 /build/grpc/bazel-bin/src/compiler/grpc_csharp_plugin_binary .
34+
USER nobody
35+
ENTRYPOINT ["/grpc_csharp_plugin_binary"]
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: v1
2+
name: buf.build/grpc/csharp
3+
plugin_version: v1.83.0
4+
source_url: https://github.com/grpc/grpc
5+
description: Generates C# client and server stubs for the gRPC framework.
6+
deps:
7+
- plugin: buf.build/protocolbuffers/csharp:v35.1
8+
output_languages:
9+
- csharp
10+
spdx_license_id: Apache-2.0
11+
license_url: https://github.com/grpc/grpc/blob/v1.83.0/LICENSE
12+
registry:
13+
opts:
14+
- base_namespace=
15+
nuget:
16+
target_frameworks:
17+
- netstandard2.0
18+
deps:
19+
- name: Grpc.Net.Common
20+
version: 2.80.0

0 commit comments

Comments
 (0)