Skip to content

Commit

Permalink
Merge pull request #939 from anarkiwi/v38
Browse files Browse the repository at this point in the history
Upgrade gnuradio to 3.10.8.
  • Loading branch information
anarkiwi authored Oct 26, 2023
2 parents 1d33504 + fc3b9f1 commit 765069b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y -q \

# nosemgrep:github.workflows.config.dockerfile-source-not-pinned
FROM ubuntu:22.04
COPY --from=iqtlabs/gnuradio:3.10.7 /usr/share/uhd/images /usr/share/uhd/images
COPY --from=iqtlabs/gnuradio:3.10.8 /usr/share/uhd/images /usr/share/uhd/images
COPY --from=installer /usr/local /usr/local
COPY --from=installer /gamutrf /gamutrf
COPY --from=installer /root/.local /root/.local
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ WORKDIR /root/uhd_sample_recorder/build
RUN CMAKE_BUILD_TYPE=Release cmake ../lib && make -j $(nproc) && cp uhd_sample_recorder /usr/local/bin

FROM ubuntu:22.04 as driver-builder
COPY --from=iqtlabs/gnuradio:3.10.7 /usr/local /usr/local
COPY --from=iqtlabs/gnuradio:3.10.8 /usr/local /usr/local
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
Expand Down Expand Up @@ -72,7 +72,7 @@ WORKDIR /root/lime-tools/build
RUN cmake .. && make install

FROM ubuntu:22.04 as gr-iqtlabs-builder
COPY --from=iqtlabs/gnuradio:3.10.7 /usr/local /usr/local
COPY --from=iqtlabs/gnuradio:3.10.8 /usr/local /usr/local
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
Expand Down Expand Up @@ -111,7 +111,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3 \
python3-numpy \
&& apt-get -y -q clean && rm -rf /var/lib/apt/lists/*
COPY --from=iqtlabs/gnuradio:3.10.7 /usr/local /usr/local
COPY --from=iqtlabs/gnuradio:3.10.8 /usr/local /usr/local
COPY --from=driver-builder /usr/local /usr/local
COPY --from=gr-iqtlabs-builder /usr/local /usr/local
COPY --from=uhd_sample_recorder-builder /usr/local /usr/local
Expand Down

0 comments on commit 765069b

Please sign in to comment.