From 192a24c4346ebd38daafe430a42dc2630c1c0a22 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 18 Jan 2023 17:15:45 +0100 Subject: [PATCH] Docker images: Upgrade Ubuntu 18->20 --- ci-scripts/cls_containerize.py | 2 +- ....base.ubuntu18 => Dockerfile.base.ubuntu20} | 4 ++-- docker/Dockerfile.build.rhel8.2 | 2 +- ...uild.ubuntu18 => Dockerfile.build.ubuntu20} | 2 +- ...le.eNB.ubuntu18 => Dockerfile.eNB.ubuntu20} | 18 +++++++++--------- ...le.gNB.ubuntu18 => Dockerfile.gNB.ubuntu20} | 18 +++++++++--------- ...teRU.ubuntu18 => Dockerfile.lteRU.ubuntu20} | 16 ++++++++-------- ...teUE.ubuntu18 => Dockerfile.lteUE.ubuntu20} | 18 +++++++++--------- ...up.ubuntu18 => Dockerfile.nr-cuup.ubuntu20} | 4 ++-- ....nrUE.ubuntu18 => Dockerfile.nrUE.ubuntu20} | 18 +++++++++--------- docker/README.md | 13 +++++++------ 11 files changed, 58 insertions(+), 57 deletions(-) rename docker/{Dockerfile.base.ubuntu18 => Dockerfile.base.ubuntu20} (97%) rename docker/{Dockerfile.build.ubuntu18 => Dockerfile.build.ubuntu20} (98%) rename docker/{Dockerfile.eNB.ubuntu18 => Dockerfile.eNB.ubuntu20} (88%) rename docker/{Dockerfile.gNB.ubuntu18 => Dockerfile.gNB.ubuntu20} (89%) rename docker/{Dockerfile.lteRU.ubuntu18 => Dockerfile.lteRU.ubuntu20} (88%) rename docker/{Dockerfile.lteUE.ubuntu18 => Dockerfile.lteUE.ubuntu20} (88%) rename docker/{Dockerfile.nr-cuup.ubuntu18 => Dockerfile.nr-cuup.ubuntu20} (97%) rename docker/{Dockerfile.nrUE.ubuntu18 => Dockerfile.nrUE.ubuntu20} (88%) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index b1b147b145..6b478956cc 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -343,7 +343,7 @@ class Containerize(): self.host = result.group(0) if self.host == 'Ubuntu': self.cli = 'docker' - self.dockerfileprefix = '.ubuntu18' + self.dockerfileprefix = '.ubuntu20' self.cliBuildOptions = '--no-cache' elif self.host == 'Red Hat': self.cli = 'sudo podman' diff --git a/docker/Dockerfile.base.ubuntu18 b/docker/Dockerfile.base.ubuntu20 similarity index 97% rename from docker/Dockerfile.base.ubuntu18 rename to docker/Dockerfile.base.ubuntu20 index 7cf2ecceaa..3f5e2dcd7a 100644 --- a/docker/Dockerfile.base.ubuntu18 +++ b/docker/Dockerfile.base.ubuntu20 @@ -21,12 +21,12 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- -FROM ubuntu:bionic AS ran-base +FROM ubuntu:focal AS ran-base ARG NEEDED_GIT_PROXY ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.build.rhel8.2 b/docker/Dockerfile.build.rhel8.2 index 4978c0c50d..c7f111a01d 100644 --- a/docker/Dockerfile.build.rhel8.2 +++ b/docker/Dockerfile.build.rhel8.2 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for RHEL8 # #--------------------------------------------------------------------- diff --git a/docker/Dockerfile.build.ubuntu18 b/docker/Dockerfile.build.ubuntu20 similarity index 98% rename from docker/Dockerfile.build.ubuntu18 rename to docker/Dockerfile.build.ubuntu20 index 62c3b84c10..cc8d4babb2 100644 --- a/docker/Dockerfile.build.ubuntu18 +++ b/docker/Dockerfile.build.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- diff --git a/docker/Dockerfile.eNB.ubuntu18 b/docker/Dockerfile.eNB.ubuntu20 similarity index 88% rename from docker/Dockerfile.eNB.ubuntu18 rename to docker/Dockerfile.eNB.ubuntu20 index 1c85eb1232..23493650ed 100644 --- a/docker/Dockerfile.eNB.ubuntu18 +++ b/docker/Dockerfile.eNB.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-enb +FROM ubuntu:focal as oai-enb ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -84,13 +84,13 @@ COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=enb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin COPY --from=enb-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/Dockerfile.gNB.ubuntu18 b/docker/Dockerfile.gNB.ubuntu20 similarity index 89% rename from docker/Dockerfile.gNB.ubuntu18 rename to docker/Dockerfile.gNB.ubuntu20 index 681dd9d3d7..a6fa773dc2 100644 --- a/docker/Dockerfile.gNB.ubuntu18 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-gnb +FROM ubuntu:focal as oai-gnb ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe @@ -85,13 +85,13 @@ COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=gnb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin COPY --from=gnb-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/Dockerfile.lteRU.ubuntu18 b/docker/Dockerfile.lteRU.ubuntu20 similarity index 88% rename from docker/Dockerfile.lteRU.ubuntu18 rename to docker/Dockerfile.lteRU.ubuntu20 index 88fbc59bbb..b86af8ed0d 100644 --- a/docker/Dockerfile.lteRU.ubuntu18 +++ b/docker/Dockerfile.lteRU.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-lte-ru +FROM ubuntu:focal as oai-lte-ru ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -77,12 +77,12 @@ COPY --from=ru-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib COPY --from=ru-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin COPY --from=ru-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ + /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/Dockerfile.lteUE.ubuntu18 b/docker/Dockerfile.lteUE.ubuntu20 similarity index 88% rename from docker/Dockerfile.lteUE.ubuntu18 rename to docker/Dockerfile.lteUE.ubuntu20 index 4175bab297..8917f4d670 100644 --- a/docker/Dockerfile.lteUE.ubuntu18 +++ b/docker/Dockerfile.lteUE.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -34,7 +34,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-lte-ue +FROM ubuntu:focal as oai-lte-ue ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -85,13 +85,13 @@ COPY --from=lte-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin COPY --from=lte-ue-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/Dockerfile.nr-cuup.ubuntu18 b/docker/Dockerfile.nr-cuup.ubuntu20 similarity index 97% rename from docker/Dockerfile.nr-cuup.ubuntu18 rename to docker/Dockerfile.nr-cuup.ubuntu20 index 94d1ff5ef7..e836d87fef 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu18 +++ b/docker/Dockerfile.nr-cuup.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh -FROM ubuntu:bionic as oai-nr-cuup +FROM ubuntu:focal as oai-nr-cuup ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.nrUE.ubuntu18 b/docker/Dockerfile.nrUE.ubuntu20 similarity index 88% rename from docker/Dockerfile.nrUE.ubuntu18 rename to docker/Dockerfile.nrUE.ubuntu20 index 5fdf41ef2d..4c7118d501 100644 --- a/docker/Dockerfile.nrUE.ubuntu18 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-nr-ue +FROM ubuntu:focal as oai-nr-ue ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -93,13 +93,13 @@ COPY --from=nr-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin COPY --from=nr-ue-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ + /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/README.md b/docker/README.md index c591ee3d75..069799e368 100644 --- a/docker/README.md +++ b/docker/README.md @@ -68,6 +68,7 @@ Targets can be: - `build` for an image named `ran-build` (shared image) - `eNB` for an image named `oai-enb` - `gNB` for an image named `oai-gnb` +- `nr-cuup` for an image named `oai-nr-cuup` - `gNB.aw2s` for an image named `oai-gnb-aw2s` - `lteUE` for an image named `oai-lte-ue` - `nrUE` for an image named `oai-nr-ue` @@ -75,17 +76,17 @@ Targets can be: The currently-supported OS are: - `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster) -- `ubuntu18` for Ubuntu 18.04 LTS +- `ubuntu20` for Ubuntu 20.04 LTS For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md). -# 3. Building using `docker` under Ubuntu 18.04 # +# 3. Building using `docker` under Ubuntu 20.04 # ## 3.1. Pre-requisites ## * `git` installed * `docker-ce` installed -* Pulling `ubuntu:bionic` from DockerHub +* Pulling `ubuntu:focal` from DockerHub ## 3.2. Building the shared images ## @@ -95,8 +96,8 @@ There are two shared images: one that has all dependencies, and a second that co git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git cd openairinterface5g git checkout develop -docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu18 . -docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu18 . +docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu20 . +docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu20 . ``` After building both: @@ -115,7 +116,7 @@ ran-base latest 5c9c02a5b4a8 1 minute ago For example, the eNB: ```bash -docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu18 . +docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu20 . ``` After a while: