diff --git a/services/backup/docker-server/Dockerfile b/services/backup/docker-server/Dockerfile index e7564daad..6a9342e94 100644 --- a/services/backup/docker-server/Dockerfile +++ b/services/backup/docker-server/Dockerfile @@ -1,18 +1,15 @@ FROM commapp/backup-base:1.0 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 -# todo move this to the parent Dockerfile maybe -RUN apk add gtest-dev - 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/base-image/Dockerfile b/services/base-image/Dockerfile index e0726cdbd..f5dfb0c38 100644 --- a/services/base-image/Dockerfile +++ b/services/base-image/Dockerfile @@ -1,13 +1,13 @@ FROM alpine:3.14 ENV SHELL=/bin/bash WORKDIR / COPY contents /transferred RUN apk update -RUN apk add bash cmake git build-base autoconf libtool pkgconfig boost-dev fmt +RUN apk add bash cmake git build-base autoconf libtool pkgconfig boost-dev fmt gtest-dev RUN /transferred/install_grpc.sh CMD /bin/bash diff --git a/services/tunnelbroker/docker-server/Dockerfile b/services/tunnelbroker/docker-server/Dockerfile index 4b3a2be9d..62ee2fe76 100644 --- a/services/tunnelbroker/docker-server/Dockerfile +++ b/services/tunnelbroker/docker-server/Dockerfile @@ -1,16 +1,13 @@ FROM commapp/tunnelbroker-base:1.0 ARG COMM_TEST_SERVICES ENV SHELL=/bin/bash ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES} COPY services/tunnelbroker/docker-server/contents /transferred COPY native/cpp/CommonCpp/grpc/protos/tunnelbroker.proto /transferred/server/protos/tunnelbroker.proto -# todo move this to the parent Dockerfile maybe -RUN apk add gtest-dev - RUN /transferred/build_server.sh CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then /transferred/run_tests.sh; else /transferred/run_server.sh; fi