diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile --- a/services/backup/Dockerfile +++ b/services/backup/Dockerfile @@ -18,7 +18,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN scripts/install_corrosion.sh -COPY native/cpp/CommonCpp/grpc grpc/ +ADD shared/protos grpc COPY shared/cmake cmake-components/ COPY services/backup/ /transferred/backup/ diff --git a/services/backup/blob_client/build.rs b/services/backup/blob_client/build.rs --- a/services/backup/blob_client/build.rs +++ b/services/backup/blob_client/build.rs @@ -13,7 +13,7 @@ .into_string() .unwrap(), ) { - "../grpc/protos" + "../grpc" } else { "../../../native/cpp/CommonCpp/grpc/protos" }; diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile --- a/services/blob/Dockerfile +++ b/services/blob/Dockerfile @@ -18,7 +18,7 @@ WORKDIR /transferred/blob -ADD native/cpp/CommonCpp/grpc grpc +ADD shared/protos grpc RUN ../scripts/build_service.sh diff --git a/services/identity/Dockerfile b/services/identity/Dockerfile --- a/services/identity/Dockerfile +++ b/services/identity/Dockerfile @@ -18,7 +18,7 @@ RUN rm src/*.rs COPY services/identity . -COPY native/cpp/CommonCpp/grpc/protos/identity.proto protos/ +COPY shared/protos/identity.proto protos/ # Remove the previously-built binary so that only the application itself is # rebuilt diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile --- a/services/tunnelbroker/Dockerfile +++ b/services/tunnelbroker/Dockerfile @@ -36,7 +36,7 @@ WORKDIR /transferred/tunnelbroker -ADD native/cpp/CommonCpp/grpc grpc +ADD shared/protos grpc COPY services/lib/cmake-components cmake-components COPY services/lib/docker/ scripts/ COPY services/tunnelbroker/docker/* docker/