diff --git a/services/base-image/Dockerfile b/services/base-image/Dockerfile index 31da1ba7a..507c41525 100644 --- a/services/base-image/Dockerfile +++ b/services/base-image/Dockerfile @@ -1,32 +1,35 @@ 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 \ libgtest-dev \ libcurl4-openssl-dev \ libssl-dev \ zlib1g-dev \ && 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_folly.sh . RUN ./install_folly.sh CMD /bin/bash diff --git a/services/base-image/docker/install_folly.sh b/services/base-image/docker/install_folly.sh index a23aff910..6370e5c44 100755 --- a/services/base-image/docker/install_folly.sh +++ b/services/base-image/docker/install_folly.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash set -e pushd /usr/lib git clone https://github.com/facebook/folly.git --branch v2020.01.13.00 --single-branch -git clone https://github.com/google/glog.git --branch v0.4.0 --single-branch git clone https://github.com/google/double-conversion.git --branch v3.1.5 --single-branch popd # /usr/lib diff --git a/services/base-image/docker/install_glog.sh b/services/base-image/docker/install_glog.sh new file mode 100755 index 000000000..ef0280048 --- /dev/null +++ b/services/base-image/docker/install_glog.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -e + +pushd /usr/lib +git clone https://github.com/google/glog.git --branch v0.4.0 --single-branch +popd # /usr/lib