From be4f5572a99d3f5ed7d732d0c1b3dbeaa5aa6822 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Wed, 26 Feb 2020 21:01:46 +0100 Subject: [PATCH] Staging --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index b2fe6eb..b6a5f8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,21 +49,21 @@ 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