From 73dea90052aee28a246ae55916e597abe389fa9e Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Mon, 27 Jan 2025 14:55:35 -0800 Subject: [PATCH] Build new required packages in Dockerfiles --- packages/grpc-js-xds/interop/test-client.Dockerfile | 8 +++++++- packages/grpc-js-xds/interop/test-server.Dockerfile | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/grpc-js-xds/interop/test-client.Dockerfile b/packages/grpc-js-xds/interop/test-client.Dockerfile index 98f3cbad..bd80f480 100644 --- a/packages/grpc-js-xds/interop/test-client.Dockerfile +++ b/packages/grpc-js-xds/interop/test-client.Dockerfile @@ -14,7 +14,7 @@ # Dockerfile for building the xDS interop client. To build the image, run the # following command from grpc-node directory: -# docker build -t -f packages/grpc-js-xds/interop/Dockerfile . +# docker build -t -f packages/grpc-js-xds/interop/test-client.Dockerfile . FROM node:18-slim as build @@ -24,6 +24,10 @@ COPY . . WORKDIR /node/src/grpc-node/packages/proto-loader RUN npm install +WORKDIR /node/src/grpc-node/packages/grpc-health-check +RUN npm install +WORKDIR /node/src/grpc-node/packages/grpc-reflection +RUN npm install WORKDIR /node/src/grpc-node/packages/grpc-js RUN npm install WORKDIR /node/src/grpc-node/packages/grpc-js-xds @@ -32,6 +36,8 @@ RUN npm install FROM gcr.io/distroless/nodejs18-debian11:latest WORKDIR /node/src/grpc-node COPY --from=build /node/src/grpc-node/packages/proto-loader ./packages/proto-loader/ +COPY --from=build /node/src/grpc-node/packages/grpc-health-check ./packages/grpc-health-check/ +COPY --from=build /node/src/grpc-node/packages/grpc-reflection ./packages/grpc-reflection/ COPY --from=build /node/src/grpc-node/packages/grpc-js ./packages/grpc-js/ COPY --from=build /node/src/grpc-node/packages/grpc-js-xds ./packages/grpc-js-xds/ diff --git a/packages/grpc-js-xds/interop/test-server.Dockerfile b/packages/grpc-js-xds/interop/test-server.Dockerfile index 61698f84..da04881e 100644 --- a/packages/grpc-js-xds/interop/test-server.Dockerfile +++ b/packages/grpc-js-xds/interop/test-server.Dockerfile @@ -14,7 +14,7 @@ # Dockerfile for building the xDS interop client. To build the image, run the # following command from grpc-node directory: -# docker build -t -f packages/grpc-js-xds/interop/Dockerfile . +# docker build -t -f packages/grpc-js-xds/interop/test-server.Dockerfile . FROM node:18-slim as build @@ -24,6 +24,10 @@ COPY . . WORKDIR /node/src/grpc-node/packages/proto-loader RUN npm install +WORKDIR /node/src/grpc-node/packages/grpc-health-check +RUN npm install +WORKDIR /node/src/grpc-node/packages/grpc-reflection +RUN npm install WORKDIR /node/src/grpc-node/packages/grpc-js RUN npm install WORKDIR /node/src/grpc-node/packages/grpc-js-xds @@ -32,6 +36,8 @@ RUN npm install FROM gcr.io/distroless/nodejs18-debian11:latest WORKDIR /node/src/grpc-node COPY --from=build /node/src/grpc-node/packages/proto-loader ./packages/proto-loader/ +COPY --from=build /node/src/grpc-node/packages/grpc-health-check ./packages/grpc-health-check/ +COPY --from=build /node/src/grpc-node/packages/grpc-reflection ./packages/grpc-reflection/ COPY --from=build /node/src/grpc-node/packages/grpc-js ./packages/grpc-js/ COPY --from=build /node/src/grpc-node/packages/grpc-js-xds ./packages/grpc-js-xds/