From 6b2761e76d3329a7f915822f7f355a5bc3af5c3d Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Wed, 26 Feb 2020 01:20:28 +0100 Subject: [PATCH] Fix buildchain --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42bc0b1..5277bcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,15 +38,14 @@ RUN git clone https://github.com/MOVE-II/move2radio.git && \ git clone git@${PROP_SERVER}:${PROP_DIR_SDR}/libfec.git move2radio-prop/fec # Build sources -WORKDIR /app/move2radio +RUN mkdir -p /app/move2radio-prop/fec/build && cd /app/move2radio-prop/fec/build && \ + cmake -DCMAKE_INSTALL_PREFIX=/app/move2radio/build/prefix/usr .. && make && make install && \ + mkdir -p /app/move2radio-prop/ldpc/build && cd /app/move2radio-prop/ldpc/build && \ + cmake -DCMAKE_INSTALL_PREFIX=/app/move2radio/build/prefix/usr .. && make && make install COPY build/CMakeLists.txt /app/move2radio/CMakeLists.txt -RUN mkdir build WORKDIR /app/move2radio/build -RUN cmake -DAPPIMAGE=OFF -DCONDA_ENV=OFF -DLDPC_OFFLINE=ON -DGR_CCSDS_OFFLINE=ON -DFEC_OFFLINE=ON -DOFFLINE_DEPENDENCY_PATH=/app/move2radio-prop .. -RUN make build_gr_osmosdr -# RUN make install_fec build_ldpc build_curlpp -# RUN make build_gr_ccsds -# RUN make move2radio +RUN cmake -DAPPIMAGE=OFF -DCONDA_ENV=OFF -DLDPC_OFFLINE=ON -DGR_CCSDS_OFFLINE=ON -DFEC_OFFLINE=ON -DOFFLINE_DEPENDENCY_PATH=/app/move2radio-prop .. && \ + make move2radio # # Run stage # FROM base AS run