Merge pull request #10 from anarkiwi/ub24update

Update for gnuradio v3.10.10.0 and Ubuntu 24.

.github/workflows/docker-test.yml

@@ -0,0 +1,11 @@
+name: docker-test
+on: [push, pull_request]
+jobs:
+  test-images:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: docker build
+      run: |
+        docker build -f Dockerfile.dependencies . -t iqtlabs/gnuradio-dependencies:latest
+        docker build --build-arg GNURADIO_TAG=v3.10.10.0 -t iqtlabs/gnuradio:3.10.10.0 -f Dockerfile .

Dockerfile

@@ -1,5 +1,5 @@
 ARG DEPENDENCIES_VERSION="latest"
-FROM iqtlabs/gnuradio-dependencies:${DEPENDENCIES_VERSION} as gr-builder
+FROM iqtlabs/gnuradio-dependencies:${DEPENDENCIES_VERSION} AS gr-builder
 
 ARG GNURADIO_TAG
 
@@ -9,7 +9,7 @@ RUN git clone --depth 1 https://github.com/gnuradio/gnuradio -b ${GNURADIO_TAG}
 WORKDIR /root/gnuradio/build
 RUN CMAKE_CXX_STANDARD=17 cmake -DENABLE_DEFAULT=ON -DENABLE_PYTHON=ON -DENABLE_GNURADIO_RUNTIME=ON -DENABLE_GR_BLOCKS=ON -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER=ON -DENABLE_GR_ANALOG=ON -DENABLE_GR_UHD=ON -DENABLE_GR_NETWORK=ON -DENABLE_GR_SOAPY=ON -DENABLE_GR_ZEROMQ=ON .. && make -j "$(nproc)" && make install
 
-FROM iqtlabs/gnuradio-dependencies:${DEPENDENCIES_VERSION} as driver-builder
+FROM iqtlabs/gnuradio-dependencies:${DEPENDENCIES_VERSION} AS driver-builder
 COPY --from=gr-builder /usr/local /usr/local
 
 WORKDIR /root
@@ -28,6 +28,5 @@ RUN cmake .. && make install
 
 FROM iqtlabs/gnuradio-dependencies:${DEPENDENCIES_VERSION}
 COPY --from=driver-builder /usr/local /usr/local
-RUN ln -s /usr/local/lib/python3/dist-packages/* /usr/local/lib/python3.10/dist-packages
 RUN ldconfig -v
 RUN python3 -c "from gnuradio import analog, blocks, gr, network, soapy, zeromq"

Dockerfile.dependencies

@@ -3,6 +3,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends software-proper
     apt-get -y --no-install-recommends install \
     build-essential \
     cmake \
+    cppzmq-dev \
     g++ \
     gcc \
     git \
@@ -25,8 +26,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends software-proper
     libvulkan-dev \
     libzmq3-dev \
     make \
-    netcat \
+    netcat-traditional \
     pkg-config \
+    pybind11-dev \
     python3-bladerf \
     python3-mako \
     python3-numpy \
@@ -36,18 +38,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends software-proper
     python3-uhd \
     python3-zmq \
     sudo \
-    swig \
     uhd-host \
     unzip \
     wget
-RUN /usr/lib/uhd/utils/uhd_images_downloader.py -t "b2|usb"
+RUN /usr/bin/uhd_images_downloader -t "b2|usb"
 WORKDIR /root
 # https://wiki.gnuradio.org/index.php/GNU_Radio_3.9_OOT_Module_Porting_Guide
-RUN git clone --depth 1 https://github.com/pybind/pybind11 -b v2.11.1
 RUN git clone --depth 1 https://github.com/gnuradio/volk -b v3.1.2
 RUN git clone --depth 1 https://github.com/pothosware/SoapySDR -b soapy-sdr-0.8.1
-WORKDIR /root/pybind11/build
-RUN cmake -DPYBIND11_TEST="" .. && make -j "$(nproc)" && make install
 WORKDIR /root/volk/build
 RUN git submodule update --init
 RUN cmake .. && make -j "$(nproc)" && make install