From 4cd75da3311b66b03d8452ea2795a8198ee7d62b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 21:01:00 +0000 Subject: [PATCH] Update ubuntu Docker tag to v24 --- Dockerfile | 4 ++-- docker/Dockerfile.airspyfm | 4 ++-- docker/Dockerfile.base | 4 ++-- docker/Dockerfile.driver | 4 ++-- docker/Dockerfile.sigmf | 4 ++-- docker/Dockerfile.torchsig | 2 +- docker/Dockerfile.uhd-sr | 4 ++-- docker/Dockerfile.vkfft | 4 ++-- docker/Dockerfile.waterfall | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67e44ce1..7fb4f8b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # nosemgrep:github.workflows.config.dockerfile-source-not-pinned -FROM ubuntu:22.04 as installer +FROM ubuntu:24.04 as installer ARG POETRY_CACHE ENV DEBIAN_FRONTEND noninteractive ENV PATH="${PATH}:/root/.local/bin" @@ -43,7 +43,7 @@ COPY templates templates/ RUN poetry install --no-interaction --no-ansi --no-dev # nosemgrep:github.workflows.config.dockerfile-source-not-pinned -FROM ubuntu:22.04 +FROM ubuntu:24.04 ARG POETRY_CACHE LABEL maintainer="Charlie Lewis " ENV DEBIAN_FRONTEND noninteractive diff --git a/docker/Dockerfile.airspyfm b/docker/Dockerfile.airspyfm index f458f57e..667dccf3 100644 --- a/docker/Dockerfile.airspyfm +++ b/docker/Dockerfile.airspyfm @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as builder +FROM ubuntu:24.04 as builder RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common && \ apt-get -y --no-install-recommends install \ build-essential \ @@ -17,7 +17,7 @@ RUN cmake .. && make && make install WORKDIR /root/airspy-fmradion/build RUN git submodule update --init RUN cmake .. && make && make install -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update && apt-get install -y --no-install-recommends \ libportaudio2 libsoxr0 libusb-1.0-0 libairspy0 libsndfile1 librtlsdr0 COPY --from=builder /usr/local /usr/local diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index a7862076..ef8ec14b 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as gr-iqtlabs-builder +FROM ubuntu:24.04 as gr-iqtlabs-builder COPY --from=iqtlabs/gnuradio:3.10.9.2 /usr/local /usr/local ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -20,7 +20,7 @@ WORKDIR /root/gr-iqtlabs/build COPY --from=iqtlabs/gamutrf-sigmf:latest /usr/local /usr/local RUN cmake .. && make -j "$(nproc)" && make install -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ libboost-filesystem1.74.0 \ diff --git a/docker/Dockerfile.driver b/docker/Dockerfile.driver index c29ef970..368318bf 100644 --- a/docker/Dockerfile.driver +++ b/docker/Dockerfile.driver @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as driver-builder +FROM ubuntu:24.04 as driver-builder COPY --from=iqtlabs/gnuradio:3.10.9.2 /usr/local /usr/local ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -37,5 +37,5 @@ WORKDIR /root/bladeRF/host/build RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DINSTALL_UDEV_RULES=ON -DENABLE_BACKEND_LIBUSB=TRUE .. && make -j "$(nproc)" && make install WORKDIR /root/lime-tools/build RUN cmake .. && make install -FROM ubuntu:22.04 +FROM ubuntu:24.04 COPY --from=driver-builder /usr/local /usr/local diff --git a/docker/Dockerfile.sigmf b/docker/Dockerfile.sigmf index a2222af5..d3feb769 100644 --- a/docker/Dockerfile.sigmf +++ b/docker/Dockerfile.sigmf @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as sigmf-builder +FROM ubuntu:24.04 as sigmf-builder ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends build-essential ca-certificates cmake git WORKDIR /root @@ -12,5 +12,5 @@ RUN cmake .. && make -j "$(nproc)" && make install WORKDIR /root/libsigmf/build RUN cmake -DUSE_SYSTEM_JSON=ON -DUSE_SYSTEM_FLATBUFFERS=ON .. && make -j "$(nproc)" && make install -FROM ubuntu:22.04 +FROM ubuntu:24.04 COPY --from=sigmf-builder /usr/local /usr/local diff --git a/docker/Dockerfile.torchsig b/docker/Dockerfile.torchsig index 55027c8b..a0850857 100644 --- a/docker/Dockerfile.torchsig +++ b/docker/Dockerfile.torchsig @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as torchsig-builder +FROM ubuntu:24.04 as torchsig-builder WORKDIR /root ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends build-essential ca-certificates cmake git python3-pip python3-dev && pip install -U pip diff --git a/docker/Dockerfile.uhd-sr b/docker/Dockerfile.uhd-sr index 04850565..84544852 100644 --- a/docker/Dockerfile.uhd-sr +++ b/docker/Dockerfile.uhd-sr @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as uhd_sample_recorder-builder +FROM ubuntu:24.04 as uhd_sample_recorder-builder ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ @@ -18,5 +18,5 @@ COPY --from=iqtlabs/gamutrf-sigmf:latest /usr/local /usr/local WORKDIR /root/uhd_sample_recorder/build RUN cmake ../lib && make -j $(nproc) && cp uhd_sample_recorder /usr/local/bin -FROM ubuntu:22.04 +FROM ubuntu:24.04 COPY --from=uhd_sample_recorder-builder /usr/local /usr/local diff --git a/docker/Dockerfile.vkfft b/docker/Dockerfile.vkfft index bce8641f..fce29114 100644 --- a/docker/Dockerfile.vkfft +++ b/docker/Dockerfile.vkfft @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as vkfft-builder +FROM ubuntu:24.04 as vkfft-builder ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ @@ -12,7 +12,7 @@ RUN git clone https://github.com/DTolm/VkFFT -b v1.3.4 WORKDIR /root/VkFFT/build RUN CMAKE_BUILD_TYPE=Release cmake -DGLSLANG_GIT_TAG=13.0.0 .. && make -j "$(nproc)" -FROM ubuntu:22.04 +FROM ubuntu:24.04 # TODO: ideally, should be packaged such that cmake can find it. # hadolint ignore=DL3008 WORKDIR /root diff --git a/docker/Dockerfile.waterfall b/docker/Dockerfile.waterfall index 546a2058..bd00da49 100644 --- a/docker/Dockerfile.waterfall +++ b/docker/Dockerfile.waterfall @@ -1,5 +1,5 @@ # nosemgrep:github.workflows.config.dockerfile-source-not-pinned -FROM ubuntu:22.04 as installer +FROM ubuntu:24.04 as installer ARG POETRY_CACHE ENV DEBIAN_FRONTEND noninteractive ENV PATH="${PATH}:/root/.local/bin" @@ -39,7 +39,7 @@ RUN poetry run pip install --no-cache-dir pycairo=="$(grep pycairo pyproject.tom RUN if [ "${POETRY_CACHE}" != "" ] ; then echo using cache "${POETRY_CACHE}" ; poetry source add --priority=default local "${POETRY_CACHE}" ; fi RUN poetry install --no-interaction --no-ansi --no-dev -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive ENV PATH="${PATH}:/root/.local/bin" SHELL ["/bin/bash", "-o", "pipefail", "-c"]