diff options
| author | Christian Hopps <chopps@gmail.com> | 2021-05-04 10:41:58 -0400 |
|---|---|---|
| committer | Christian Hopps <chopps@labn.net> | 2021-05-13 16:24:48 -0400 |
| commit | 3bb513c399c2e7c8dd597b7399dd7c0f064842d0 (patch) | |
| tree | 14f3e677c49fce272946788f8a8b8f3f8a3e26b5 /docker | |
| parent | 17daea8a184c0e85b9788329f3c808ceab916ad5 (diff) | |
lib: adapt to version 2 of libyang
Compile with v2.0.0 tag of `libyang2` branch of:
https://github.com/CESNET/libyang
staticd init load time of 10k routes now 6s vs ly1 time of 150s
Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ubuntu18-ci/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/ubuntu20-ci/Dockerfile | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docker/ubuntu18-ci/Dockerfile b/docker/ubuntu18-ci/Dockerfile index f6fa910381..86fbe4f49c 100644 --- a/docker/ubuntu18-ci/Dockerfile +++ b/docker/ubuntu18-ci/Dockerfile @@ -26,19 +26,19 @@ RUN groupadd -r -g 92 frr && \ echo 'frr ALL = NOPASSWD: ALL' | tee /etc/sudoers.d/frr && \ mkdir -p /home/frr && chown frr.frr /home/frr -#for libyang 1 -RUN apt-get install -y cmake libpcre3-dev +#for libyang 2 +RUN apt-get install -y cmake libpcre2-dev USER frr:frr # build and install libyang1 RUN cd && pwd && ls -al && \ - git clone https://github.com/CESNET/libyang.git && \ + git clone https://github.com/CESNET/libyang.git -b libyang2 && \ cd libyang && \ - git checkout v1.0.225 && \ + git checkout v2.0.0 && \ mkdir build; cd build && \ - cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -D CMAKE_BUILD_TYPE:String="Release" .. && \ + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:String="Release" .. && \ make -j $(nproc) && \ sudo make install @@ -47,7 +47,7 @@ COPY --chown=frr:frr . /home/frr/frr/ RUN cd && ls -al && ls -al frr RUN cd ~/frr && \ - ./bootstrap.sh && \ + ./bootstrap.sh && \ ./configure \ --prefix=/usr \ --localstatedir=/var/run/frr \ diff --git a/docker/ubuntu20-ci/Dockerfile b/docker/ubuntu20-ci/Dockerfile index 0b08c2f278..ead5c56c54 100644 --- a/docker/ubuntu20-ci/Dockerfile +++ b/docker/ubuntu20-ci/Dockerfile @@ -29,19 +29,19 @@ RUN groupadd -r -g 92 frr && \ echo 'frr ALL = NOPASSWD: ALL' | tee /etc/sudoers.d/frr && \ mkdir -p /home/frr && chown frr.frr /home/frr -#for libyang 1 -RUN apt-get install -y cmake libpcre3-dev +#for libyang 2 +RUN apt-get install -y cmake libpcre2-dev USER frr:frr # build and install libyang1 RUN cd && pwd && ls -al && \ - git clone https://github.com/CESNET/libyang.git && \ + git clone https://github.com/CESNET/libyang.git -b libyang2 && \ cd libyang && \ - git checkout v1.0.225 && \ + git checkout v2.0.0 && \ mkdir build; cd build && \ - cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -D CMAKE_BUILD_TYPE:String="Release" .. && \ + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:String="Release" .. && \ make -j $(nproc) && \ sudo make install @@ -50,7 +50,7 @@ COPY --chown=frr:frr . /home/frr/frr/ RUN cd && ls -al && ls -al frr RUN cd ~/frr && \ - ./bootstrap.sh && \ + ./bootstrap.sh && \ ./configure \ --prefix=/usr \ --localstatedir=/var/run/frr \ |