From fb0ee05dd500f863ca4887b236e9db74347b28f8 Mon Sep 17 00:00:00 2001
From: Christoph Honal <christoph.honal@web.de>
Date: Wed, 26 Feb 2020 21:01:07 +0100
Subject: [PATCH] Short dockerfile

---
 Dockerfile | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 62fe5aa..b2fe6eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,24 +44,26 @@ 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
 COPY build/CMakeLists.txt /app/move2radio/CMakeLists.txt
 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 .. && \
-    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 ..
+RUN make build_boost build_curlpp
+RUN make build_gr_osmosdr
+# RUN make move2radio
 
-# Run stage
-FROM base AS run
-ENV DEBIAN_FRONTEND=noninteractive TZ=Europe/Berlin
-ENV PATH="/app/move2radio/build/prefix/usr/bin:${PATH}" \
-    PYTHONPATH="/app/move2radio/build/prefix/usr/lib/python2.7/dist-packages:${PYTHONPATH}" \
-    LD_LIBRARY_PATH="/app/move2radio/build/prefix/usr/lib:${LD_LIBRARY_PATH}"
+# # Run stage
+# FROM base AS run
+# ENV DEBIAN_FRONTEND=noninteractive TZ=Europe/Berlin
+# ENV PATH="/app/move2radio/build/prefix/usr/bin:${PATH}" \
+#     PYTHONPATH="/app/move2radio/build/prefix/usr/lib/python2.7/dist-packages:${PYTHONPATH}" \
+#     LD_LIBRARY_PATH="/app/move2radio/build/prefix/usr/lib:${LD_LIBRARY_PATH}"
 
-# Copy sources from build stage
-COPY --from=build /app/move2radio/build/prefix/usr /app/move2radio/build/prefix/usr
-COPY --from=build /app/move2radio/AppDir/move-ii-gr/AR4JA_r12_k1024n.a /app/gnuradio/
-COPY build/gnuradio/* /app/gnuradio/
+# # Copy sources from build stage
+# COPY --from=build /app/move2radio/build/prefix/usr /app/move2radio/build/prefix/usr
+# COPY --from=build /app/move2radio/AppDir/move-ii-gr/AR4JA_r12_k1024n.a /app/gnuradio/
+# COPY build/gnuradio/* /app/gnuradio/
 
-# Install binaries
-COPY build/fakeserver/* /app/fakeserver/
-COPY build/run*.sh /app/
-RUN chmod +x /app/run*.sh && ldconfig
+# # Install binaries
+# COPY build/fakeserver/* /app/fakeserver/
+# COPY build/run*.sh /app/
+# RUN chmod +x /app/run*.sh && ldconfig
 
-ENTRYPOINT ["/app/run-cli.sh"]
\ No newline at end of file
+# ENTRYPOINT ["/app/run-cli.sh"]
\ No newline at end of file