Verified Commit bb7ebd45 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Add gcovr to build image and reformat Dockerfile

parent 172fe4ce

docker/debian_build_env.docker

+16 −9
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ ENV SCRIPTS_PATH ${GKFS_PATH}/scripts 
ENV DEPS_SRC_PATH	${GKFS_PATH}/deps_src

ENV INSTALL_PATH	${GKFS_PATH}/build_deps



RUN apt-get update && apt-get install -y --no-install-recommends \

RUN apt-get update && \

    apt-get install -y --no-install-recommends \

		git \

		curl \

		ca-certificates \
@@ -38,8 +39,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 
		valgrind \

		uuid-dev \

		python3 \

		python3-pip \

		python3-dev \

		python3-venv \

		python3-setuptools \

		expect \

		# clang 10 deps

		lsb-release \
@@ -47,13 +50,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 
		software-properties-common \

		gnupg2 \

    # add clang-10 repos

&& wget https://apt.llvm.org/llvm.sh -P /tmp && chmod +x /tmp/llvm.sh && /tmp/llvm.sh 10 \

    wget https://apt.llvm.org/llvm.sh -P /tmp && chmod +x /tmp/llvm.sh && /tmp/llvm.sh 10 && \

    # install clang-format

&& apt-get update && apt-get install -y --no-install-recommends clang-format-10 \

    apt-get update && apt-get install -y --no-install-recommends clang-format-10 && \

    # install gcovr

    # (required for partial coverage reports in parallel runs)

    python3 -m pip install --upgrade pip && \

    pip3 install gcovr && \

    # Clean apt cache to reduce image layer size

&& rm -rf /var/lib/apt/lists/* && rm /tmp/llvm.sh \

    rm -rf /var/lib/apt/lists/* && rm /tmp/llvm.sh && \

    # Clean apt caches of packages

&& apt-get clean && apt-get autoclean

    apt-get clean && apt-get autoclean



## COPY scripts/dl_dep.sh		$SCRIPTS_PATH/

## COPY scripts/compile_dep.sh $SCRIPTS_PATH/