From 4899c5510149422c7ee46a151fbf422f69efbd6c Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 22 Oct 2020 17:05:08 +0200
Subject: [PATCH] [docker] adding some tools and missing USIM generation config
file
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
docker/Dockerfile.eNB.ubuntu18 | 3 +--
docker/Dockerfile.gNB.rhel8.2 | 2 ++
docker/Dockerfile.gNB.rhel8.2.oc4-4 | 2 ++
docker/Dockerfile.gNB.ubuntu18 | 1 +
docker/Dockerfile.lteUE.rhel8.2 | 2 ++
docker/Dockerfile.lteUE.rhel8.2.oc4-4 | 2 ++
docker/Dockerfile.lteUE.ubuntu18 | 2 ++
docker/Dockerfile.nrUE.rhel8.2 | 2 ++
docker/Dockerfile.nrUE.rhel8.2.oc4-4 | 2 ++
docker/Dockerfile.nrUE.ubuntu18 | 1 +
10 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile.eNB.ubuntu18 b/docker/Dockerfile.eNB.ubuntu18
index 1d2fbd2729b..9b6e5cb47d8 100644
--- a/docker/Dockerfile.eNB.ubuntu18
+++ b/docker/Dockerfile.eNB.ubuntu18
@@ -57,6 +57,7 @@ RUN apt-get update && \
libconfig9 \
openssl \
net-tools \
+ iputils-ping \
iproute2 \
libyaml-0-2 && \
# Install UHD driver from ettus ppa
@@ -64,8 +65,6 @@ RUN apt-get update && \
add-apt-repository ppa:ettusresearch/uhd --yes && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes \
- net-tools \
- iputils-ping \
python \
libusb-1.0-0 \
libuhd003 \
diff --git a/docker/Dockerfile.gNB.rhel8.2 b/docker/Dockerfile.gNB.rhel8.2
index dd7f7f7933f..901df9757cc 100644
--- a/docker/Dockerfile.gNB.rhel8.2
+++ b/docker/Dockerfile.gNB.rhel8.2
@@ -52,6 +52,8 @@ RUN yum repolist --disablerepo=* && \
atlas \
lksctp-tools \
nettle \
+ net-tools \
+ iputils \
libyaml && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
diff --git a/docker/Dockerfile.gNB.rhel8.2.oc4-4 b/docker/Dockerfile.gNB.rhel8.2.oc4-4
index 8092922a6a7..197bc2a92ad 100644
--- a/docker/Dockerfile.gNB.rhel8.2.oc4-4
+++ b/docker/Dockerfile.gNB.rhel8.2.oc4-4
@@ -53,6 +53,8 @@ RUN yum repolist --disablerepo=* && \
atlas \
lksctp-tools \
nettle \
+ net-tools \
+ iputils \
libyaml && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
diff --git a/docker/Dockerfile.gNB.ubuntu18 b/docker/Dockerfile.gNB.ubuntu18
index 256ab9ddea6..4135b0e785f 100644
--- a/docker/Dockerfile.gNB.ubuntu18
+++ b/docker/Dockerfile.gNB.ubuntu18
@@ -59,6 +59,7 @@ RUN apt-get update && \
openssl \
net-tools \
iproute2 \
+ iputils-ping \
libyaml-0-2 && \
# Install UHD driver from ettus ppa
# At time of writing, it is 3.14
diff --git a/docker/Dockerfile.lteUE.rhel8.2 b/docker/Dockerfile.lteUE.rhel8.2
index a175e3f727f..6b64fdec1e1 100644
--- a/docker/Dockerfile.lteUE.rhel8.2
+++ b/docker/Dockerfile.lteUE.rhel8.2
@@ -51,6 +51,7 @@ RUN yum update -y && \
atlas \
iproute \
net-tools \
+ iputils \
libyaml && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
@@ -114,6 +115,7 @@ RUN ldconfig
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-lte-ue/etc
COPY --from=lte-ue-build /oai-ran/ci-scripts/conf_files/ue.* .
+COPY --from=lte-ue-build /oai-ran/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf ./ue_usim.conf
WORKDIR /opt/oai-lte-ue
#CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem", "-O", "/opt/oai-lte-ue/etc/enb.conf"]
diff --git a/docker/Dockerfile.lteUE.rhel8.2.oc4-4 b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
index 6891243a3c0..c390e01e3b9 100644
--- a/docker/Dockerfile.lteUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.lteUE.rhel8.2.oc4-4
@@ -51,6 +51,7 @@ RUN yum update -y && \
atlas \
iproute \
net-tools \
+ iputils \
libyaml && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
@@ -114,6 +115,7 @@ RUN ldd /usr/local/lib/libdfts.so
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-lte-ue/etc
COPY --from=lte-ue-build /oai-ran/ci-scripts/conf_files/ue.* .
+COPY --from=lte-ue-build /oai-ran/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf ./ue_usim.conf
WORKDIR /opt/oai-lte-ue
#CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem", "-O", "/opt/oai-lte-ue/etc/enb.conf"]
diff --git a/docker/Dockerfile.lteUE.ubuntu18 b/docker/Dockerfile.lteUE.ubuntu18
index 133537a239a..f1233d6a014 100644
--- a/docker/Dockerfile.lteUE.ubuntu18
+++ b/docker/Dockerfile.lteUE.ubuntu18
@@ -58,6 +58,7 @@ RUN apt-get update && \
libconfig9 \
openssl \
net-tools \
+ iputils-ping \
iproute2 \
libyaml-0-2 && \
# Install UHD driver from ettus ppa
@@ -114,6 +115,7 @@ RUN ldconfig
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-lte-ue/etc
COPY --from=lte-ue-build /oai-ran/ci-scripts/conf_files/ue.* ./
+COPY --from=lte-ue-build /oai-ran/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf ./ue_usim.conf
WORKDIR /opt/oai-lte-ue
#CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem", "-O", "/opt/oai-lte-ue/etc/enb.conf"]
diff --git a/docker/Dockerfile.nrUE.rhel8.2 b/docker/Dockerfile.nrUE.rhel8.2
index 1461ce3f7a3..466eeedd403 100644
--- a/docker/Dockerfile.nrUE.rhel8.2
+++ b/docker/Dockerfile.nrUE.rhel8.2
@@ -48,6 +48,8 @@ RUN yum update -y && \
yum install -y --enablerepo="ubi-8-codeready-builder" \
lksctp-tools \
nettle \
+ net-tools \
+ iputils \
atlas \
libXpm \
libX11 \
diff --git a/docker/Dockerfile.nrUE.rhel8.2.oc4-4 b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
index 42724d483b3..3b09b18b552 100644
--- a/docker/Dockerfile.nrUE.rhel8.2.oc4-4
+++ b/docker/Dockerfile.nrUE.rhel8.2.oc4-4
@@ -49,6 +49,8 @@ RUN yum update -y && \
yum install -y --enablerepo="ubi-8-codeready-builder" \
lksctp-tools \
nettle \
+ net-tools \
+ iputils \
atlas \
libXpm \
libX11 \
diff --git a/docker/Dockerfile.nrUE.ubuntu18 b/docker/Dockerfile.nrUE.ubuntu18
index fd63e4544e0..eecadacb507 100644
--- a/docker/Dockerfile.nrUE.ubuntu18
+++ b/docker/Dockerfile.nrUE.ubuntu18
@@ -58,6 +58,7 @@ RUN apt-get update && \
libconfig9 \
openssl \
net-tools \
+ iputils-ping \
iproute2 \
libyaml-0-2 && \
# Install UHD driver from ettus ppa
--
GitLab