From 8c04afbbca4575465d43b99f30eb39c08a0db7ad Mon Sep 17 00:00:00 2001 From: Steven Koo Date: Thu, 20 Jan 2022 09:43:59 -0600 Subject: ci: Add support for Ubuntu 22.04 Signed-off-by: Steven Koo --- .ci/docker/uhd-builder-ubuntu2204.Dockerfile | 67 ++++++++++++++++++++++++++++ .ci/uhd-build-docker-container.yml | 6 ++- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 .ci/docker/uhd-builder-ubuntu2204.Dockerfile (limited to '.ci') diff --git a/.ci/docker/uhd-builder-ubuntu2204.Dockerfile b/.ci/docker/uhd-builder-ubuntu2204.Dockerfile new file mode 100644 index 000000000..1ccc7ec86 --- /dev/null +++ b/.ci/docker/uhd-builder-ubuntu2204.Dockerfile @@ -0,0 +1,67 @@ +# please follow docker best practices +# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/ + +FROM ubuntu:22.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 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 \ + # 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-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 1f0a65ef3..55a2a2714 100644 --- a/.ci/uhd-build-docker-container.yml +++ b/.ci/uhd-build-docker-container.yml @@ -41,7 +41,8 @@ variables: "{'Fedora-34-builder':{'buildOSName':'fedora34','dockerImageName':'uhd-builder-fedora34'}, 'Fedora-35-builder':{'buildOSName':'fedora35','dockerImageName':'uhd-builder-fedora35'}, 'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804'}, - 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}}" + 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004'}, + 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204'}}" - name: winDockerImages value: "{'VS2017-x86-builder':{'buildOSName':'win-vs17-v141-x86','dockerImageName':'uhd-builder-vs2017-v141-x86','cmakeCompiler':'Visual Studio 15 2017','cmakeArch':'Win32','vsArch':'x86','vsYear':'2017'}, @@ -53,7 +54,8 @@ variables: # Match with Ubuntu images in linuxDockerImages value: "{'Ubuntu-1804-builder':{'buildOSName':'ubuntu1804','dockerImageName':'uhd-builder-ubuntu1804','ubuntuReleaseName':'bionic'}, - 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}}" + 'Ubuntu-2004-builder':{'buildOSName':'ubuntu2004','dockerImageName':'uhd-builder-ubuntu2004','ubuntuReleaseName':'focal'}, + 'Ubuntu-2204-builder':{'buildOSName':'ubuntu2204','dockerImageName':'uhd-builder-ubuntu2204','ubuntuReleaseName':'jammy'}}" - name: macOSBuilders value: -- cgit v1.2.3