Page MenuHomePhabricator
Files F3112335

D3462.diff
No OneTemporary
Actions

D3462.diff
View Options

diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile
--- a/services/backup/docker-server/Dockerfile
+++ b/services/backup/docker-server/Dockerfile
@@ -9,6 +9,7 @@
COPY services/backup/docker-server/contents /transferred
COPY native/cpp/CommonCpp/grpc/protos/backup.proto /transferred/server/protos/backup.proto
+COPY native/cpp/CommonCpp/grpc/protos/blob.proto /transferred/server/protos/blob.proto
RUN /transferred/build_server.sh
diff --git a/services/backup/docker-server/contents/server/generate.sh b/services/backup/docker-server/contents/server/generate.sh
--- a/services/backup/docker-server/contents/server/generate.sh
+++ b/services/backup/docker-server/contents/server/generate.sh
@@ -5,5 +5,6 @@
echo "generating files from protos..."
protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/backup.proto
+protoc -I=./protos --cpp_out=_generated --grpc_out=_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` ./protos/blob.proto
echo "success - code generated from protos"
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -1,4 +1,7 @@
version: "3.9"
+networks:
+ services-net:
+ name: services-net
services:
tunnelbroker-server:
build:
@@ -21,6 +24,8 @@
context: ../
image: commapp/backup-base:1.2
backup-server:
+ networks:
+ - services-net
build:
dockerfile: services/backup/docker-server/Dockerfile
context: ../
@@ -34,6 +39,8 @@
volumes:
- $HOME/.aws/credentials:/root/.aws/credentials:ro
blob-server:
+ networks:
+ - services-net
build:
dockerfile: services/blob/Dockerfile
context: ../

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 1, 5:13 PM (21 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2399470
Default Alt Text
D3462.diff (1 KB)

Event Timeline