From 383c47fcae4a52835382d9ff92427e96c85b992f Mon Sep 17 00:00:00 2001 From: Stefan VanBuren Date: Mon, 19 Aug 2024 08:57:16 -0400 Subject: [PATCH] Revert v1.65.2 and v27.1 changes --- plugins/grpc/csharp/v1.65.2/.dockerignore | 1 - plugins/grpc/csharp/v1.65.2/Dockerfile | 6 ------ plugins/grpc/csharp/v1.65.2/buf.plugin.yaml | 1 + plugins/grpc/csharp/v1.65.2/build.csproj | 9 --------- plugins/protocolbuffers/csharp/v27.1/.dockerignore | 1 - plugins/protocolbuffers/csharp/v27.1/Dockerfile | 6 ------ plugins/protocolbuffers/csharp/v27.1/build.csproj | 8 -------- 7 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 plugins/grpc/csharp/v1.65.2/build.csproj delete mode 100644 plugins/protocolbuffers/csharp/v27.1/build.csproj diff --git a/plugins/grpc/csharp/v1.65.2/.dockerignore b/plugins/grpc/csharp/v1.65.2/.dockerignore index b2a42ae1e..5d0f124ff 100644 --- a/plugins/grpc/csharp/v1.65.2/.dockerignore +++ b/plugins/grpc/csharp/v1.65.2/.dockerignore @@ -1,3 +1,2 @@ * !Dockerfile -!build.csproj diff --git a/plugins/grpc/csharp/v1.65.2/Dockerfile b/plugins/grpc/csharp/v1.65.2/Dockerfile index 8b57efb8e..21bc0f872 100644 --- a/plugins/grpc/csharp/v1.65.2/Dockerfile +++ b/plugins/grpc/csharp/v1.65.2/Dockerfile @@ -17,16 +17,10 @@ WORKDIR /build/grpc RUN bazel build //src/compiler:grpc_plugin_support RUN bazel build //src/compiler:grpc_csharp_plugin.stripped -FROM mcr.microsoft.com/dotnet/sdk:6.0.424-bookworm-slim@sha256:39f73995c6d4f64f1a81f4ec42617cb71a797a23da93a5b0109ab06e5094fdae AS dotnetrestore -WORKDIR /build -COPY --link ./build.csproj /build/build.csproj -RUN mkdir /nuget && dotnet restore --packages /nuget - FROM gcr.io/distroless/cc-debian12:latest@sha256:3b75fdd33932d16e53a461277becf57c4f815c6cee5f6bc8f52457c095e004c8 AS base FROM scratch COPY --link --from=base / / -COPY --link --from=dotnetrestore --chmod=0755 /nuget /nuget COPY --link --from=build --chmod=0755 /build/grpc/bazel-bin/src/compiler/grpc_csharp_plugin . USER nobody ENTRYPOINT ["/grpc_csharp_plugin"] diff --git a/plugins/grpc/csharp/v1.65.2/buf.plugin.yaml b/plugins/grpc/csharp/v1.65.2/buf.plugin.yaml index 945c8aeb5..db91ae941 100644 --- a/plugins/grpc/csharp/v1.65.2/buf.plugin.yaml +++ b/plugins/grpc/csharp/v1.65.2/buf.plugin.yaml @@ -18,3 +18,4 @@ registry: deps: - name: Grpc.Net.Common version: 2.63.0 + diff --git a/plugins/grpc/csharp/v1.65.2/build.csproj b/plugins/grpc/csharp/v1.65.2/build.csproj deleted file mode 100644 index 28a7f7989..000000000 --- a/plugins/grpc/csharp/v1.65.2/build.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - netstandard2.0 - - - - - - diff --git a/plugins/protocolbuffers/csharp/v27.1/.dockerignore b/plugins/protocolbuffers/csharp/v27.1/.dockerignore index 71e50a495..abbf4b500 100644 --- a/plugins/protocolbuffers/csharp/v27.1/.dockerignore +++ b/plugins/protocolbuffers/csharp/v27.1/.dockerignore @@ -2,4 +2,3 @@ !BUILD !csharp.cc !Dockerfile -!build.csproj diff --git a/plugins/protocolbuffers/csharp/v27.1/Dockerfile b/plugins/protocolbuffers/csharp/v27.1/Dockerfile index cb5a9bee0..3fd08f11e 100644 --- a/plugins/protocolbuffers/csharp/v27.1/Dockerfile +++ b/plugins/protocolbuffers/csharp/v27.1/Dockerfile @@ -18,16 +18,10 @@ RUN bazel build '//:protoc_lib' COPY --link BUILD csharp.cc plugins/ RUN bazel build '//plugins:protoc-gen-csharp.stripped' -FROM mcr.microsoft.com/dotnet/sdk:6.0.424-bookworm-slim@sha256:39f73995c6d4f64f1a81f4ec42617cb71a797a23da93a5b0109ab06e5094fdae AS dotnetrestore -WORKDIR /build -COPY --link ./build.csproj /build/build.csproj -RUN mkdir /nuget && dotnet restore --packages /nuget - FROM gcr.io/distroless/cc-debian12:latest@sha256:e1065a1d58800a7294f74e67c32ec4146d09d6cbe471c1fa7ed456b2d2bf06e0 AS base FROM scratch COPY --from=base --link / / -COPY --link --from=dotnetrestore --chmod=0755 /nuget /nuget COPY --from=build --link --chmod=0755 /build/bazel-bin/plugins/protoc-gen-csharp . USER nobody ENTRYPOINT ["/protoc-gen-csharp"] diff --git a/plugins/protocolbuffers/csharp/v27.1/build.csproj b/plugins/protocolbuffers/csharp/v27.1/build.csproj deleted file mode 100644 index 6c3d5097d..000000000 --- a/plugins/protocolbuffers/csharp/v27.1/build.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - netstandard1.1 - - - - -