aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Hofrichter <joerg.hofrichter@ni.com>2024-03-15 11:19:14 +0100
committerjoergho <48011876+joergho@users.noreply.github.com>2024-03-28 11:50:40 +0100
commitf1974545b4cf2e556b40931b1aae7f8743242272 (patch)
treecb1c43c26519e3fd2ce3683cf9ad3d6096db915b
parentci: add parameter to build linux/windows containers conditionally (diff)
downloaduhd-f1974545b4cf2e556b40931b1aae7f8743242272.tar.xz
uhd-f1974545b4cf2e556b40931b1aae7f8743242272.zip
ci: add Ubuntu-2404-builder
-rw-r--r--.ci/docker/uhd-builder-ubuntu2404.Dockerfile70
-rw-r--r--.ci/uhd-build-docker-container.yml6
2 files changed, 74 insertions, 2 deletions
diff --git a/.ci/docker/uhd-builder-ubuntu2404.Dockerfile b/.ci/docker/uhd-builder-ubuntu2404.Dockerfile
new file mode 100644
index 000000000..b843742d6
--- /dev/null
+++ b/.ci/docker/uhd-builder-ubuntu2404.Dockerfile
@@ -0,0 +1,70 @@
+# please follow docker best practices
+# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
+
+FROM ubuntu:24.04
+LABEL maintainer="Ettus Research"
+
+# This will make apt-get install without question
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+ apt-get -y upgrade && \
+ apt-get -y install -q \
+ build-essential \
+ ccache \
+ clang \
+ curl \
+ git \
+ sudo \
+ # Install formatting tools
+ clang-format-14 \
+ # Install UHD dependencies
+ abi-dumper \
+ cmake \
+ doxygen \
+ dpdk \
+ libboost-all-dev \
+ libdpdk-dev \
+ libgps-dev \
+ libgps-dev \
+ libudev-dev \
+ libusb-1.0-0-dev \
+ ncompress \
+ ninja-build \
+ python3-dev \
+ python3-docutils \
+ python3-mako \
+ python3-numpy \
+ python3-pip \
+ python3-requests \
+ pybind11-dev \
+ # Install deb dependencies
+ debootstrap \
+ devscripts \
+ pbuilder \
+ debhelper \
+ libncurses5-dev \
+ python3-ruamel.yaml \
+ # Install GNURadio dependencies
+ python3-sphinx \
+ python3-lxml \
+ libsdl1.2-dev \
+ libgsl-dev \
+ libqwt-qt5-dev \
+ libqt5opengl5-dev \
+ libgmp3-dev \
+ libfftw3-dev \
+ swig \
+ gir1.2-gtk-3.0 \
+ libpango1.0-dev \
+ python3-pyqt5 \
+ liblog4cpp5-dev \
+ libzmq3-dev \
+ python3-ruamel.yaml \
+ python3-click \
+ python3-click-plugins \
+ python3-zmq \
+ python3-scipy \
+ python3-gi-cairo \
+ && \
+ rm -rf /var/lib/apt/lists/*
diff --git a/.ci/uhd-build-docker-container.yml b/.ci/uhd-build-docker-container.yml
index 57ffc3140..f7857a5cc 100644
--- a/.ci/uhd-build-docker-container.yml
+++ b/.ci/uhd-build-docker-container.yml
@@ -47,7 +47,8 @@ variables:
'Fedora-37-builder':{'buildOSName':'fedora37','dockerImageName':'uhd-builder-fedora37'},
'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'},
'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'},
- 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204'}}"
+ 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204'},
+ 'Ubuntu-2404-builder':{'buildOSName':'ubuntu2404','dockerImageName':'uhd-builder-ubuntu2404'}}"
- ${{ else }}:
- name: linuxDockerImages
value:
@@ -67,7 +68,8 @@ variables:
value:
"{'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804','ubuntuReleaseName':'bionic'},
'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'},
- 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204','ubuntuReleaseName':'jammy'}}"
+ 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204','ubuntuReleaseName':'jammy'},
+ 'Ubuntu-2404-builder':{'buildOSName':'ubuntu2404','dockerImageName':'uhd-builder-ubuntu2404','ubuntuReleaseName':'noble'}}"
- name: macOSBuilders
value: