Skip to content

Commit

Permalink
Revert v1.65.2 and v27.1 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanvanburen committed Aug 19, 2024
1 parent ea7849b commit 383c47f
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 31 deletions.
1 change: 0 additions & 1 deletion plugins/grpc/csharp/v1.65.2/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
*
!Dockerfile
!build.csproj
6 changes: 0 additions & 6 deletions plugins/grpc/csharp/v1.65.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
1 change: 1 addition & 0 deletions plugins/grpc/csharp/v1.65.2/buf.plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ registry:
deps:
- name: Grpc.Net.Common
version: 2.63.0

9 changes: 0 additions & 9 deletions plugins/grpc/csharp/v1.65.2/build.csproj

This file was deleted.

1 change: 0 additions & 1 deletion plugins/protocolbuffers/csharp/v27.1/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
!BUILD
!csharp.cc
!Dockerfile
!build.csproj
6 changes: 0 additions & 6 deletions plugins/protocolbuffers/csharp/v27.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
8 changes: 0 additions & 8 deletions plugins/protocolbuffers/csharp/v27.1/build.csproj

This file was deleted.

0 comments on commit 383c47f

Please sign in to comment.