From cb1bd198be398d116b9633ade0836d0e362e0707 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Tue, 25 Feb 2020 14:15:45 +0100 Subject: [PATCH] 2020 deps --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82b00a5..1334144 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,9 @@ WORKDIR /app RUN git clone https://github.com/MOVE-II/move2radio.git && \ cd move2radio && git checkout 6fcbae73359b0618312d222148aba07799a43a47 && git reset --hard && cd .. && \ git clone git@${PROP_SERVER}:${PROP_DIR_SDR}/ldpc.git move2radio-prop/ldpc && \ - cd move2radio-prop/ldpc && git checkout 940e8f96ccae831c7d3ad6b9497710696cd7f324 && git reset --hard && cd ../.. && \ + cd move2radio-prop/ldpc && git checkout 67decffcc74cafff19f7a31f11492fb69c8698eb && git reset --hard && cd ../.. && \ git clone git@${PROP_SERVER}:${PROP_DIR_SDR}/gr-ccsds.git move2radio-prop/gr-ccsds && \ - cd move2radio-prop/gr-ccsds && git checkout 5777e4176fe381327fe6cf55b7ec0dfe3c63b3f6 && git reset --hard && cd ../.. + cd move2radio-prop/gr-ccsds && git checkout c1b8a3fb5d77c02060ddb49b9936097f1d15e536 && git reset --hard && cd ../.. # Base stage with deps @@ -69,7 +69,7 @@ ENV PATH="/app/move2radio/build/prefix/usr/bin:${PATH}" \ LD_LIBRARY_PATH="/app/move2radio/build/prefix/usr/lib:${LD_LIBRARY_PATH}" # Install binaries -COPY build/blocks/* app/move2radio/build/prefix/usr/share/gnuradio/grc/blocks/ +# COPY build/blocks/* app/move2radio/build/prefix/usr/share/gnuradio/grc/blocks/ COPY build/fakeserver/* /app/fakeserver/ COPY build/run*.sh /app/ RUN chmod 644 app/move2radio/build/prefix/usr/share/gnuradio/grc/blocks/*.xml && \