diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile index 33bbf94af..0397d350c 100644 --- a/services/backup/Dockerfile +++ b/services/backup/Dockerfile @@ -1,27 +1,27 @@ -FROM commapp/services-base:1.3.1 +FROM commapp/services-base:1.3.2 RUN apt-get update && \ apt-get install -y uuid-dev && \ rm -rf /var/lib/apt/lists/* ARG COMM_TEST_SERVICES ARG COMM_SERVICES_SANDBOX ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES} ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX} WORKDIR /transferred COPY services/backup/ backup/ COPY services/lib/src/ lib/src/ WORKDIR /transferred/backup COPY native/cpp/CommonCpp/grpc grpc/ COPY services/lib/docker/ scripts/ RUN scripts/build_service.sh WORKDIR /transferred CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi diff --git a/services/base-image/Dockerfile b/services/base-image/Dockerfile index acff7797d..eedc585c3 100644 --- a/services/base-image/Dockerfile +++ b/services/base-image/Dockerfile @@ -1,39 +1,40 @@ FROM ubuntu:20.04 ENV SHELL=/bin/bash RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ cmake \ git \ build-essential \ autoconf \ libtool \ pkg-config \ libboost-all-dev \ libfmt-dev \ libgflags-dev \ libgtest-dev \ libcurl4-openssl-dev \ libssl-dev \ zlib1g-dev \ + curl \ && rm -rf /var/lib/apt/lists/* RUN mkdir -p /transferred/scripts WORKDIR /transferred/scripts COPY docker/install_grpc.sh . RUN ./install_grpc.sh COPY docker/install_aws_sdk.sh . RUN ./install_aws_sdk.sh COPY docker/install_glog.sh . RUN ./install_glog.sh COPY docker/install_double.sh . RUN ./install_double.sh COPY docker/install_folly.sh . RUN ./install_folly.sh CMD /bin/bash diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile index e2cf382e8..d7665bb13 100644 --- a/services/blob/Dockerfile +++ b/services/blob/Dockerfile @@ -1,25 +1,25 @@ -FROM commapp/services-base:1.3.1 +FROM commapp/services-base:1.3.2 RUN apt-get update && \ apt-get install -y uuid-dev && \ rm -rf /var/lib/apt/lists/* ARG COMM_TEST_SERVICES ARG COMM_SERVICES_SANDBOX ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES} ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX} WORKDIR /transferred COPY services/lib/docker/ scripts/ COPY services/blob/ blob COPY services/lib/src lib/src/ WORKDIR /transferred/blob ADD native/cpp/CommonCpp/grpc grpc RUN ../scripts/build_service.sh CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then ../scripts/run_tests.sh; else ../scripts/run_service.sh; fi diff --git a/services/scripts/build_base_image.sh b/services/scripts/build_base_image.sh index 8bfc53579..629ce470b 100755 --- a/services/scripts/build_base_image.sh +++ b/services/scripts/build_base_image.sh @@ -1,30 +1,30 @@ #!/usr/bin/env bash set -e if [[ "$#" -gt 1 ]]; then echo "usage: $0 [TAG]" exit 1 fi -tag=${1:-"1.3.1"} +tag=${1:-"1.3.2"} BUILDER_NAME="COMM_BUILDER" BUILDER_PRESENT=$(docker buildx inspect "$BUILDER_NAME" 2> /dev/null || echo "") if [[ -z "${BUILDER_PRESENT}" ]]; then echo "builder not found, creating builder $BUILDER_NAME"; docker buildx create --name "$BUILDER_NAME" fi; docker buildx use "$BUILDER_NAME" # use --push to automatically push this image to the hub docker buildx build \ --tag commapp/services-base:"${tag}" \ -o type=image \ --platform=linux/arm64,linux/amd64 \ --push \ base-image/Dockerfile diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile index e742e2d84..b866d0858 100644 --- a/services/tunnelbroker/Dockerfile +++ b/services/tunnelbroker/Dockerfile @@ -1,46 +1,46 @@ -FROM commapp/services-base:1.3.1 +FROM commapp/services-base:1.3.2 ARG MAKE_JOBS=4 ENV MAKEFLAGS="-j${MAKE_JOBS}" WORKDIR /transferred/scripts # Install Curl RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl # Install SDKs COPY services/tunnelbroker/docker/install_amqp_cpp.sh . RUN ./install_amqp_cpp.sh COPY services/tunnelbroker/docker/install_cryptopp.sh . RUN ./install_cryptopp.sh COPY services/tunnelbroker/docker/install_libuv.sh . RUN ./install_libuv.sh RUN curl https://sh.rustup.rs -sSf | sh -s -- -y COPY services/tunnelbroker/docker/install_corrosion.sh . RUN ./install_corrosion.sh ARG COMM_TEST_SERVICES ARG COMM_SERVICES_SANDBOX ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES} ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX} WORKDIR /transferred COPY services/lib/src/ lib/src/ WORKDIR /transferred/tunnelbroker ADD native/cpp/CommonCpp/grpc grpc COPY services/lib/cmake-components cmake-components COPY services/lib/docker/ scripts/ COPY services/tunnelbroker/docker/* docker/ COPY services/tunnelbroker/ . RUN scripts/build_service.sh CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi