diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile index 74a56f46d..b4e059172 100644 --- a/services/backup/docker-server/Dockerfile +++ b/services/backup/docker-server/Dockerfile @@ -1,15 +1,16 @@ FROM commapp/backup-base:1.2 ARG COMM_TEST_SERVICES ARG COMM_SERVICES_DEV_MODE ENV SHELL=/bin/bash ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES} ENV COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE} 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 CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then /transferred/run_tests.sh; else /transferred/run_server.sh; fi diff --git a/services/backup/docker-server/contents/server/generate.sh b/services/backup/docker-server/contents/server/generate.sh index af27622c1..fd7ed511f 100755 --- a/services/backup/docker-server/contents/server/generate.sh +++ b/services/backup/docker-server/contents/server/generate.sh @@ -1,9 +1,10 @@ #!/bin/bash set -e 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 index 40cad1e88..ec68c3b26 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -1,48 +1,55 @@ version: "3.9" +networks: + services-net: + name: services-net services: tunnelbroker-server: build: dockerfile: services/tunnelbroker/Dockerfile context: ../ args: - COMM_TEST_SERVICES=${COMM_TEST_SERVICES} image: commapp/tunnelbroker-server:0.2 container_name: tunnelbroker-server ports: - "${COMM_SERVICES_PORT_TUNNELBROKER}:50051" volumes: - $HOME/.aws/config:/root/.aws/config:ro - $HOME/.aws/credentials:/root/.aws/credentials:ro - ./tunnelbroker/tunnelbroker.ini:/root/tunnelbroker/tunnelbroker.ini:ro # backup backup-base: build: dockerfile: services/backup/docker-base/Dockerfile context: ../ image: commapp/backup-base:1.2 backup-server: + networks: + - services-net build: dockerfile: services/backup/docker-server/Dockerfile context: ../ args: - COMM_TEST_SERVICES=${COMM_TEST_SERVICES} - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE} image: commapp/backup-server:0.1 container_name: backup-server ports: - "${COMM_SERVICES_PORT_BACKUP}:50051" volumes: - $HOME/.aws/credentials:/root/.aws/credentials:ro blob-server: + networks: + - services-net build: dockerfile: services/blob/Dockerfile context: ../ args: - COMM_TEST_SERVICES=${COMM_TEST_SERVICES} - COMM_SERVICES_DEV_MODE=${COMM_SERVICES_DEV_MODE} image: commapp/blob-server:0.1 container_name: blob-server ports: - "${COMM_SERVICES_PORT_BLOB}:50051" volumes: - $HOME/.aws/credentials:/root/.aws/credentials:ro