From ab3876874c0f2a88abecdb6fbf9f656c10ed65c2 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 5 Apr 2024 17:24:35 +0000
Subject: [PATCH] NBI component:
- Updated README.md file
- Fixed libyang version in Dockerfile
- Fixed libyang version in install_requirements.sh
- Added folder libyang to global gitignore
- Added generation of .gitignore file for libyang/build
---
.gitignore | 3 +++
install_requirements.sh | 3 +++
src/nbi/Dockerfile | 3 +++
src/nbi/README.md | 3 +++
4 files changed, 12 insertions(+)
diff --git a/.gitignore b/.gitignore
index a9144d669..20b98c30c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,5 +171,8 @@ local_k8s_deployment.sh
# asdf configuration
.tool-versions
+# libyang build files
+libyang/
+
# Other logs
**/logs/*.log.*
diff --git a/install_requirements.sh b/install_requirements.sh
index c59ea7f13..65f60c121 100755
--- a/install_requirements.sh
+++ b/install_requirements.sh
@@ -32,8 +32,11 @@ sudo apt-get --yes --quiet --quiet update
sudo apt-get --yes --quiet --quiet install build-essential cmake libpcre2-dev python3-dev python3-cffi
mkdir libyang
git clone https://github.com/CESNET/libyang.git libyang
+git fetch
+git checkout v2.1.148
mkdir libyang/build
cd libyang/build
+echo "*" > .gitignore
cmake -D CMAKE_BUILD_TYPE:String="Release" ..
make
sudo make install
diff --git a/src/nbi/Dockerfile b/src/nbi/Dockerfile
index eda4d2956..cb81256da 100644
--- a/src/nbi/Dockerfile
+++ b/src/nbi/Dockerfile
@@ -61,6 +61,9 @@ RUN apt-get --yes --quiet --quiet update && \
rm -rf /var/lib/apt/lists/*
RUN mkdir -p /var/libyang
RUN git clone https://github.com/CESNET/libyang.git /var/libyang
+WORKDIR /var/libyang
+RUN git fetch
+RUN git checkout v2.1.148
RUN mkdir -p /var/libyang/build
WORKDIR /var/libyang/build
RUN cmake -D CMAKE_BUILD_TYPE:String="Release" ..
diff --git a/src/nbi/README.md b/src/nbi/README.md
index c5ed72704..32902a0b3 100644
--- a/src/nbi/README.md
+++ b/src/nbi/README.md
@@ -18,6 +18,9 @@ sudo apt-get install python3-dev gcc python3-cffi
```bash
mkdir ~/tfs-ctrl/libyang
git clone https://github.com/CESNET/libyang.git ~/tfs-ctrl/libyang
+cd ~/tfs-ctrl/libyang
+git fetch
+git checkout v2.1.148
mkdir ~/tfs-ctrl/libyang/build
cd ~/tfs-ctrl/libyang/build
cmake -D CMAKE_BUILD_TYPE:String="Release" ..
--
GitLab