Skip to content

Commit

Permalink
Update ubuntu Docker tag to v24
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored May 9, 2024
1 parent 6df0bb9 commit 4cd75da
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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 <[email protected]>"
ENV DEBIAN_FRONTEND noninteractive
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.airspyfm
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.driver
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/Dockerfile.sigmf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion docker/Dockerfile.torchsig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.uhd-sr
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
4 changes: 2 additions & 2 deletions docker/Dockerfile.vkfft
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.waterfall
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"]
Expand Down

0 comments on commit 4cd75da

Please sign in to comment.