From d47ee877be5d1175bdc36f2d87881ddaf875a8e9 Mon Sep 17 00:00:00 2001 From: Oleg Morozenkov Date: Mon, 23 Jul 2018 01:56:42 +0300 Subject: Refactor http clients, fix webhook server, add more samples, change tabs to 4 spaces --- Dockerfile_test | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'Dockerfile_test') diff --git a/Dockerfile_test b/Dockerfile_test index e1093bf..8d4bec0 100644 --- a/Dockerfile_test +++ b/Dockerfile_test @@ -2,31 +2,40 @@ FROM debian:stretch MAINTAINER Oleg Morozenkov RUN apt-get -qq update && \ - apt-get -qq install -y g++ make binutils cmake libssl-dev libboost-system-dev libboost-test-dev libcurl4-openssl-dev + apt-get -qq install -y g++ make binutils cmake libssl-dev libboost-system-dev libboost-test-dev libcurl4-openssl-dev -WORKDIR /tmp/tgbot-cpp +WORKDIR /usr/src/tgbot-cpp COPY include include COPY src src COPY test test -COPY samples samples COPY CMakeLists.txt ./ RUN cmake -DENABLE_TESTS=ON . && \ - make -j4 && \ - make install + make -j4 && \ + make install + +COPY samples samples + +WORKDIR /usr/src/tgbot-cpp/samples/echobot +RUN rm -rf CMakeCache.txt CMakeFiles/ && \ + cmake . && make -j4 + +WORKDIR /usr/src/tgbot-cpp/samples/echobot-curl-client +RUN rm -rf CMakeCache.txt CMakeFiles/ && \ + cmake . && make -j4 -WORKDIR /tmp/tgbot-cpp/samples/echobot +WORKDIR /usr/src/tgbot-cpp/samples/echobot-webhook-server RUN rm -rf CMakeCache.txt CMakeFiles/ && \ cmake . && make -j4 -WORKDIR /tmp/tgbot-cpp/samples/inline-keyboard +WORKDIR /usr/src/tgbot-cpp/samples/inline-keyboard RUN rm -rf CMakeCache.txt CMakeFiles/ && \ cmake . && make -j4 -WORKDIR /tmp/tgbot-cpp/samples/photo +WORKDIR /usr/src/tgbot-cpp/samples/photo RUN rm -rf CMakeCache.txt CMakeFiles/ && \ cmake . && make -j4 -WORKDIR /tmp/tgbot-cpp +WORKDIR /usr/src/tgbot-cpp ENV CTEST_OUTPUT_ON_FAILURE=1 CMD make test -- cgit v1.2.3