diff options
| author | Christian Hopps <chopps@labn.net> | 2023-12-30 23:40:07 +0100 |
|---|---|---|
| committer | Christian Hopps <chopps@labn.net> | 2023-12-31 14:51:21 +0100 |
| commit | c00002d0d061cf44dc986a6adaa434d9bfa43b3d (patch) | |
| tree | 1f1b7bd04d9a5dbcb0af6ff3e322356b16e9d797 /docker | |
| parent | Merge pull request #14492 from LabNConsulting/oper-state (diff) | |
| download | frr-c00002d0d061cf44dc986a6adaa434d9bfa43b3d.tar.xz frr-c00002d0d061cf44dc986a6adaa434d9bfa43b3d.zip | |
build: protobuf is required so update building docs
- recommend using libyang 2.1.128 but accept 2.0.0 for now.
- update ubuntu building doc to add GRPC section
- update ubuntu reference docker builds to match grpc doc change
Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ubuntu-ci/Dockerfile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/ubuntu-ci/Dockerfile b/docker/ubuntu-ci/Dockerfile index f228fe808..5cdbdb0f3 100644 --- a/docker/ubuntu-ci/Dockerfile +++ b/docker/ubuntu-ci/Dockerfile @@ -41,6 +41,12 @@ RUN apt update && apt upgrade -y && \ cmake \ libpcre2-dev \ && \ + # GRPC extra build requirements + apt-get install -y \ + libgrpc-dev \ + libgrpc++-dev \ + protobuf-compiler-grpc \ + && \ # Runtime/triage/testing requirements apt-get install -y \ curl \ @@ -91,7 +97,7 @@ USER frr:frr RUN cd && pwd && ls -al && \ git clone https://github.com/CESNET/libyang.git && \ cd libyang && \ - git checkout v2.1.80 && \ + git checkout v2.1.128 && \ mkdir build; cd build && \ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_BUILD_TYPE:String="Release" .. && \ @@ -112,6 +118,7 @@ RUN cd ~/frr && \ --enable-user=frr \ --enable-group=frr \ --enable-config-rollbacks \ + --enable-grpc \ --enable-vty-group=frrvty \ --enable-snmp=agentx \ --enable-scripting \ |