Commit 662c6e1a authored by Sagar Arora's avatar Sagar Arora

Install yaml-cpp-dev for CU-UP and rocky

Co-authored-by: default avatarRobert Schmidt <robert.schmidt@openairinterface.org>
Signed-off-by: default avatarSagar Arora <sagar.arora@openairinterface.org>
parent 389ca60d
...@@ -51,7 +51,8 @@ RUN dnf update -y && \ ...@@ -51,7 +51,8 @@ RUN dnf update -y && \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
net-tools \ net-tools \
iputils && \ iputils \
yaml-cpp-devel && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
......
...@@ -49,7 +49,8 @@ RUN dnf update -y && \ ...@@ -49,7 +49,8 @@ RUN dnf update -y && \
python3 \ python3 \
python3-pip \ python3-pip \
net-tools \ net-tools \
iputils && \ iputils \
yaml-cpp-devel && \
pip3 install six && \ pip3 install six && \
pip3 install requests && \ pip3 install requests && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
......
...@@ -47,7 +47,8 @@ RUN dnf update -y && \ ...@@ -47,7 +47,8 @@ RUN dnf update -y && \
python3 \ python3 \
python3-pip \ python3-pip \
net-tools \ net-tools \
iputils && \ iputils \
yaml-cpp-devel && \
pip3 install six && \ pip3 install six && \
pip3 install requests && \ pip3 install requests && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
......
...@@ -35,6 +35,9 @@ RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypo ...@@ -35,6 +35,9 @@ RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypo
FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-cuup FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-cuup
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
# Install EPEL
RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
RUN yum repolist --disablerepo=* && \ RUN yum repolist --disablerepo=* && \
yum update -y && \ yum update -y && \
yum install -y \ yum install -y \
...@@ -42,7 +45,8 @@ RUN yum repolist --disablerepo=* && \ ...@@ -42,7 +45,8 @@ RUN yum repolist --disablerepo=* && \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
net-tools \ net-tools \
iputils && \ iputils \
yaml-cpp-devel && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
...@@ -55,6 +59,7 @@ COPY --from=gnb-build \ ...@@ -55,6 +59,7 @@ COPY --from=gnb-build \
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
/oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
/usr/local/lib/ /usr/local/lib/
COPY --from=gnb-base \ COPY --from=gnb-base \
......
...@@ -43,7 +43,8 @@ RUN yum repolist --disablerepo=* && \ ...@@ -43,7 +43,8 @@ RUN yum repolist --disablerepo=* && \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
net-tools \ net-tools \
iputils && \ iputils \
yaml-cpp-devel && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
...@@ -56,6 +57,7 @@ COPY --from=gnb-build \ ...@@ -56,6 +57,7 @@ COPY --from=gnb-build \
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
/oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
/usr/local/lib/ /usr/local/lib/
COPY --from=gnb-base \ COPY --from=gnb-base \
......
...@@ -42,7 +42,8 @@ RUN apt-get update && \ ...@@ -42,7 +42,8 @@ RUN apt-get update && \
libconfig9 \ libconfig9 \
iproute2 \ iproute2 \
net-tools \ net-tools \
openssl && \ openssl \
libyaml-cpp-dev && \
# if the --sanitize option was used to build, additional packages are required # if the --sanitize option was used to build, additional packages are required
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
libasan8 \ libasan8 \
...@@ -61,6 +62,7 @@ COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh ...@@ -61,6 +62,7 @@ COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
/oai-ran/cmake_targets/ran_build/build/libparams_yaml.so \
/usr/local/lib/ /usr/local/lib/
RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup RUN ldconfig && ldd /opt/oai-gnb/bin/nr-cuup
......
...@@ -48,7 +48,8 @@ RUN dnf update -y && \ ...@@ -48,7 +48,8 @@ RUN dnf update -y && \
python3 \ python3 \
python3-pip \ python3-pip \
libXpm \ libXpm \
libX11 && \ libX11 \
yaml-cpp-devel && \
pip3 install six && \ pip3 install six && \
pip3 install requests && \ pip3 install requests && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment