Update ubuntu Docker tag to v24

IQTLabs · Apr 26, 2024 · 37b7942 · 37b7942
1 parent 6753c67
commit 37b7942
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/blue/5G/daedalus/5G/UERANSIM/Dockerfile b/blue/5G/daedalus/5G/UERANSIM/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as builder
+FROM ubuntu:24.04 as builder
 LABEL maintainer="Charlie Lewis <clewis@iqt.org>"
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \
@@ -17,7 +17,7 @@ RUN make -j "$(nproc)"
 WORKDIR /usr/local/bin
 RUN cp /src/UERANSIM/build/* .
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \
      ca-certificates \

diff --git a/blue/5G/daedalus/5G/open5gs/Dockerfile b/blue/5G/daedalus/5G/open5gs/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS builder
+FROM ubuntu:24.04 AS builder
 ENV DEBIAN_FRONTEND noninteractive
 # hadolint ignore=DL3008
 RUN apt-get update && \
@@ -50,7 +50,7 @@ WORKDIR /open5gs
 RUN sed -r -i 's/C=\w+/C=NZ/g;s/ST=\w+/ST=UpperHutt/g;s/L=\w+/L=Wellington/g' misc/make-certs.sh && \
   mkdir /certs && misc/make-certs.sh /certs
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainers="Charlie Lewis <clewis@iqt.org>"
 ENV DEBIAN_FRONTEND noninteractive
 COPY --from=builder /etc/apt/keyrings/nodesource.gpg /etc/apt/keyrings/nodesource.gpg

diff --git a/blue/5G/daedalus/5G/srsRAN/Dockerfile b/blue/5G/daedalus/5G/srsRAN/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as cloner
+FROM ubuntu:24.04 as cloner
 LABEL maintainer="Charlie Lewis <clewis@iqt.org>"
 ARG SRS_VERSION=release_23_11
 ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ RUN git clone https://github.com/EttusResearch/uhd.git -b v4.4.0.0 && \
   git clone https://github.com/pothosware/SoapySDR.git -b soapy-sdr-0.8.1 && \
   git clone https://github.com/srsRAN/srsRAN.git -b ${SRS_VERSION}
 
-FROM ubuntu:22.04 as depbuilder
+FROM ubuntu:24.04 as depbuilder
 ENV DEBIAN_FRONTEND noninteractive
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install --no-install-recommends -yq \
@@ -47,7 +47,7 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_F
 WORKDIR /src/SoapySDR/build
 RUN cmake -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" -DBUILD_SHARED_LIBS=OFF ../ && make -j "$(nproc)" && make install && ldconfig
 
-FROM ubuntu:22.04 as srsbuilder
+FROM ubuntu:24.04 as srsbuilder
 ENV DEBIAN_FRONTEND noninteractive
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install --no-install-recommends -yq \
@@ -73,7 +73,7 @@ COPY --from=depbuilder /usr/local /usr/local/
 WORKDIR /src/srsRAN/build
 RUN cmake -DENABLE_AVX512=OFF -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" -DBUILD_SHARED_LIBS=OFF ../ && make -j "$(nproc)" && make install && ldconfig
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Charlie Lewis <clewis@iqt.org>"
 ENV DEBIAN_FRONTEND noninteractive
 COPY --from=srsbuilder /usr/local /usr/local

diff --git a/environments/scenario2/Dockerfile b/environments/scenario2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \

diff --git a/environments/scenario2/host2/Dockerfile b/environments/scenario2/host2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \

diff --git a/environments/scenario2/host2/srsLTE/Dockerfile b/environments/scenario2/host2/srsLTE/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \

diff --git a/environments/scenario2/host2/srsLTE/Dockerfile.bladeRF b/environments/scenario2/host2/srsLTE/Dockerfile.bladeRF
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \

diff --git a/environments/scenario2/host3/Dockerfile b/environments/scenario2/host3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \

diff --git a/environments/scenario2/host3/srsLTE/Dockerfile b/environments/scenario2/host3/srsLTE/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \

diff --git a/environments/scenario2/host3/srsLTE/Dockerfile.bladeRF b/environments/scenario2/host3/srsLTE/Dockerfile.bladeRF
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \

diff --git a/environments/scenario2/srsLTE/Dockerfile b/environments/scenario2/srsLTE/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Charlie Lewis <clewis@iqt.org>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install --no-install-recommends -yq \