Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added package to compile and link yaml parser in C++ #20698

Merged
merged 5 commits into from
Nov 18, 2024
Merged

Added package to compile and link yaml parser in C++ #20698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74cbec6
Added package to compile and link yaml parser in C++
abdosi Nov 5, 2024
0bbfb3c
Merge branch 'sonic-net:master' into libyaml
abdosi Nov 11, 2024
0052cdd
Merge branch 'sonic-net:master' into libyaml
abdosi Nov 12, 2024
b3d843f
Update Dockerfile.j2
abdosi Nov 14, 2024
ebaf63a
Update Dockerfile.j2
abdosi Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dockers/docker-fpm-frr/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN apt-get update && \
libc-ares2 \
iproute2 \
logrotate \
libyaml-cpp-dev \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming you don't actually need the development headers at runtime, there shouldn't be any changes needed in this file. Dependency resolution should be able to install the runtime library automatically.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saiarcot895 : not sure if i completely follow this comment. Without this change I was getting run-time error when fpmsyncd was running in bgp docker. PR for reference: sonic-net/sonic-swss#3353

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @saiarcot895 , i have removed the change. Yes, as part of the build of docker-swss-layer-bookworm.gz all swss dependency are resolved and we don't need to explicit install on in frr docker.

libunwind8

RUN groupadd -g ${frr_user_gid} frr
Expand Down
3 changes: 2 additions & 1 deletion sonic-slave-bookworm/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install
libswitch-perl \
libzmq5 \
libzmq3-dev \
libyaml-dev \
uuid-dev \
jq \
cron \
Expand Down Expand Up @@ -752,4 +753,4 @@ RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add armv7-unknown-linux-gnu
RUN mkdir -p /.cargo && $RUST_ROOT/bin/rustup target add aarch64-unknown-linux-gnu && echo "[target.aarch64-unknown-linux-gnu]\nlinker = \"aarch64-linux-gnu-gcc\"" >> /.cargo/config.toml
{% endif -%}
ENV RUSTUP_HOME $RUST_ROOT
ENV PATH $PATH:$RUST_ROOT/bin
ENV PATH $PATH:$RUST_ROOT/bin
Loading