From cf15b237108360ee92f35898e35fa5a52cfc889a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 10 Dec 2019 11:30:27 +0300 Subject: AppVeyor/Travis: switch to cmake/build --- client/Dockerfile | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'client/Dockerfile') diff --git a/client/Dockerfile b/client/Dockerfile index d5dd309..9b2ab51 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -8,28 +8,26 @@ LABEL maintainer="Egor Tensin " # Don't prompt: ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -yq && \ - apt-get install -yq --no-install-recommends \ +RUN apt-get update -yq \ + && apt-get install -yq --no-install-recommends \ build-essential \ cmake \ libboost-filesystem-dev \ libboost-program-options-dev \ - libboost-test-dev + libboost-test-dev \ + python3 -ENV src_dir=/tmp/src \ - build_dir=/tmp/build +ENV src_dir=/usr/src/app COPY [".", "$src_dir"] -WORKDIR $build_dir - -RUN cmake -G "Unix Makefiles" \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_INSTALL_PREFIX=/usr/local \ - -D ENABLE_TESTS=ON \ - "$src_dir" && \ - cmake --build . --config Release --target install && \ - /usr/local/bin/unit_tests --log_level=all +RUN "$src_dir/cmake/build/build.py" \ + --src "$src_dir" \ + --install /usr/local \ + --clean \ + --configuration Release \ + -- -DENABLE_TESTS=ON \ + && /usr/local/bin/unit_tests --log_level=all ENTRYPOINT ["/usr/local/bin/client"] CMD ["-c", "2 * 2"] -- cgit v1.2.3