Finally fix build
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
2020-02-26 02:30:58 +01:00
parent 6b2761e76d
commit 78133f9b55
18 changed files with 5318 additions and 520 deletions

View File

@ -47,22 +47,21 @@ 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 stage
# FROM base AS run
# ENV DEBIAN_FRONTEND=noninteractive TZ=Europe/Berlin
# 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 /app/move2radio/AppDir/move-ii-gr
# 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/
# # Install binaries
# # 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 && \
# 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"]
ENTRYPOINT ["/app/run-cli.sh"]