Merge branch 'master' of https://gitlab.fing.edu.uy/comina/lab-integrador

Dockerfile

@@ -26,7 +26,7 @@ RUN echo 'gnuradio:gnuradio' | chpasswd
 # I create a dir at home which I'll use to persist after the container is closed (need to change it's ownership)
 RUN mkdir /home/gnuradio/persistent  && chown gnuradio /home/gnuradio/persistent
 
-RUN sudo apt-get install -y cmake libusb-1.0 libusb-1.0-0-dev swig
+RUN apt-get install -y cmake libusb-1.0 libusb-1.0-0-dev swig
 
 #RUN sudo apt-get install -y rtl-sdr
 
@@ -41,12 +41,12 @@ RUN apt-get install -y git
 
 
 # Install rtl-sdr
-RUN sudo apt-get install -y git cmake libusb-1.0 libusb-1.0-0-dev swig pkg-config
+RUN apt-get install -y git cmake libusb-1.0 libusb-1.0-0-dev swig pkg-config
 RUN git clone git://git.osmocom.org/rtl-sdr.git /home/gnuradio/rtl-sdr/ && cd /home/gnuradio/rtl-sdr/ && mkdir build && cd build && cmake ../ -DINSTALL_UDEV_RULES=ON -DDETACH_KERNEL_DRIVER=ON && make && sudo make install && sudo ldconfig 
 
 
 # Install hackrf
-RUN sudo apt-get install -y libhackrf-dev
+RUN apt-get install -y libhackrf-dev
 
 # Install bladerf
 
@@ -57,10 +57,9 @@ RUN apt-get install -y libbladerf-dev
 RUN apt-get install -y python3.9 gnuradio
 
 # Install gr-osmosdr
-RUN sudo apt install liborc-0.4-0 liborc-0.4-dev
-RUN git clone https://github.com/osmocom/gr-osmosdr.git /home/gnuradio/gr-osmosdr/
-RUN cd /home/gnuradio/gr-osmosdr/ && git checkout gr3.8 && mkdir build && cd build/ && cmake -DCMAKE_INSTALL_PREFIX=/usr ../ && make && sudo make install && sudo ldconfig
-
+RUN apt install liborc-0.4-0 liborc-0.4-dev
+RUN git clone --branch gr3.8 https://github.com/osmocom/gr-osmosdr.git /home/gnuradio/gr-osmosdr/
+RUN cd /home/gnuradio/gr-osmosdr/ && mkdir build && cd build/ && cmake -DCMAKE_INSTALL_PREFIX=/usr ../ && make && make install && sudo ldconfig
 
 # installing other packages needed for downloading and installing OOT modules
 RUN apt-get install -y gnuradio-dev cmake git libboost-all-dev libcppunit-dev liblog4cpp5-dev swig liborc-dev libgsl-dev
@@ -81,7 +80,7 @@ RUN apt remove -y soapysdr0.7-module-remote
 RUN apt-get install -y libxml2 libxml2-dev bison flex libaio-dev libavahi-common-dev libavahi-client-dev liborc-dev
     
 RUN git clone https://github.com/analogdevicesinc/libiio.git /home/gnuradio/libiio
-RUN cd /home/gnuradio/libiio && mkdir build && cd build && cmake .. -DPYTHON_BINDINGS=ON && make && sudo make install
+RUN cd /home/gnuradio/libiio && git checkout v0.24 && mkdir build && cd build && cmake .. -DPYTHON_BINDINGS=ON && make && sudo make install
 
 RUN git clone https://github.com/analogdevicesinc/libad9361-iio.git /home/gnuradio/libad9361-iio
 RUN cd /home/gnuradio/libad9361-iio && mkdir build && cd build && cmake .. -DPYTHON_BINDINGS=ON && make && sudo make install

run.sh

-docker run --runtime=runc --net=host --env="DISPLAY" -v $HOME/:/opt/root --volume="$HOME/.Xauthority:/root/.Xauthority:rw" --privileged --device /dev/snd --device /dev/dri -v /dev/bus/usb/:/dev/bus/usb/ -v /var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket --privileged -v $PWD/:/home/gnuradio/persistent/ --group-add=audio -it ubuntu:comina bash 
+docker run --runtime=runc --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" --privileged --device /dev/snd --device /dev/dri -v /dev/bus/usb/:/dev/bus/usb/ -v /var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket --privileged -v $PWD/:/home/gnuradio/persistent/ --group-add=audio -it ubuntu:comina bash